Merge remote-tracking branch 'origin/master'

leromro-common/src/main/java/com/leromro/common/core/domain/entity/SysUser.java

@@ -100,6 +100,13 @@ public class SysUser extends BaseEntity
     @TableField(exist = false)
     private Long roleId;
 
+    /** 平台 web：0 小程序：1 **/
+
+    private Integer userPlatform ;
+
+    /** 1 用户  2 志愿者 **/
+    private Integer userOrWorker;
+
     public Integer getUserPlatform() {
         return userPlatform;
     }
@@ -108,14 +115,6 @@ public class SysUser extends BaseEntity
         this.userPlatform = userPlatform;
     }
 
-    /** 平台 web：0 小程序：1 **/
-
-    private Integer userPlatform ;
-
-    public SysUser(Integer userOrWorker) {
-        this.userOrWorker = userOrWorker;
-    }
-
     public Integer getUserOrWorker() {
         return userOrWorker;
     }
@@ -124,8 +123,9 @@ public class SysUser extends BaseEntity
         this.userOrWorker = userOrWorker;
     }
 
-    /** 1 用户  2 志愿者 **/
-    private Integer userOrWorker;
+    public SysUser(Integer userOrWorker) {
+        this.userOrWorker = userOrWorker;
+    }
 
     public SysUser()
     {

leromro-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+        <result property="userOrWorker"       column="user_or_worker"       />
+        <result property="userPlatform"       column="user_platform"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -47,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, 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, 
+        select u.user_id, 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.user_or_worker as user_or_worker,u.user_platform as user_platform,
         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
         from sys_user u