diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 9c116bf..a383eef 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -59,6 +59,8 @@ public class SysUser extends BaseEntity
/** 用户头像 */
private String avatar;
+ private Integer hasApproval;
+
/** 密码 */
private String password;
@@ -171,6 +173,14 @@ public class SysUser extends BaseEntity
return userId != null && 1L == userId;
}
+ public Integer getHasApproval() {
+ return hasApproval;
+ }
+
+ public void setHasApproval(Integer hasApproval) {
+ this.hasApproval = hasApproval;
+ }
+
public Long getDeptId()
{
return deptId;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6e7728a..fa9d69b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -11,6 +11,7 @@
+
@@ -55,7 +56,7 @@
- select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.shoe_size,
+ select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.shoe_size,u.has_approval,
u.user_type_cn,u.id_card, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.area_auth_code,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@@ -66,7 +67,7 @@