diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 097545e..65cc201 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -43,7 +43,6 @@ public class SysUser extends BaseEntity private Long deptId; /** 部门对象 */ - //@RelationManyToOne(selfField = "deptId", targetField = "deptId") private SysDept dept; /** 用户账号 */ @@ -53,7 +52,7 @@ public class SysUser extends BaseEntity private String nickName; /** - * 用户类型(sys_user系统用户) + * 用户登录设备类型(sys_user系统用户、app_user App用户) */ private String userType; @@ -84,24 +83,13 @@ public class SysUser extends BaseEntity /** 最后登录时间 */ private Date loginDate; - - /** 角色对象 */ -// @RelationManyToMany( -// selfField = "userId", targetField = "roleId", -// joinTable = "sys_user_role", -// joinSelfColumn = "user_id", joinTargetColumn = "role_id" -// ) private List roles; /** 角色组 */ private Long[] roleIds; -// @RelationManyToMany( -// selfField = "userId", targetField = "postId", -// joinTable = "sys_user_post", -// joinSelfColumn = "user_id", joinTargetColumn = "post_id" -// ) + private List postList; /** 岗位组 */ diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index eff7ede..d1d14cb 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -293,12 +293,21 @@ - + + + + + + + + + +