user

src/main/java/com/zglc/fm/controller/CommonController.java

@@ -83,7 +83,6 @@ public class CommonController {
         }
         if (user.getIsEnable() == 1)
             return Result.fail(ErrorCode.RET_ACCOUNT_NOT_ENABLE);
-
         login.setId(user.getId());
         login.setRealName(user.getRealName());
         login.setUserName(user.getUserName());

src/main/java/com/zglc/fm/entity/LoginVO.java

@@ -15,7 +15,7 @@ public class LoginVO {
 
     private Integer role;
 
-    private String remark;
+    private Integer remark;
 
     private String token;
 }

src/main/java/com/zglc/fm/entity/UserEntity.java

@@ -96,7 +96,7 @@ public class UserEntity implements Serializable {
 	* 
 	*/
 	@Column(name = "remark")
-	private String remark;
+	private Integer remark;
 	
 	
 }