Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/community/pocket/api/web/ManagerController.java

src/main/java/com/community/pocket/entity/po/Manager.java

@@ -13,7 +13,7 @@ public class Manager {
 //    密码
     private String password;
 //    手机号
-    private Long mobie;
+    private Long mobile;
 //    邮箱
     private String email;
     //令牌
@@ -35,12 +35,12 @@ public class Manager {
         this.password = password;
     }
 
-    public Long getMobie() {
+    public Long getMobile() {
-        return mobie;
+        return mobile;
     }
 
-    public void setMobie(Long mobie) {
+    public void setMobile(Long mobile) {
-        this.mobie = mobie;
+        this.mobile = mobile;
     }
 
     public String getEmail() {

src/main/java/com/community/pocket/entity/vo/ManagerRegister.java

@@ -11,7 +11,7 @@ public class ManagerRegister {
     //   确认密码
     private String confirmPassword;
     //    手机号
-    private Long mobie;
+    private Long mobile;
     //    邮箱
     private String email;
 
@@ -39,12 +39,12 @@ public class ManagerRegister {
         this.confirmPassword = confirmPassword;
     }
 
-    public Long getMobie() {
+    public Long getMobile() {
-        return mobie;
+        return mobile;
     }
 
-    public void setMobie(Long mobie) {
+    public void setMobile(Long mobile) {
-        this.mobie = mobie;
+        this.mobile = mobile;
     }
 
     public String getEmail() {