Merge branch 'master' of dq/kmall-pt into master

kmall-common/src/main/java/com/kmall/common/entity/SysUserEntity.java

@@ -75,6 +75,10 @@ public class SysUserEntity implements Serializable {
      */
     private String deptName;
 
+    private Integer storeId;
+
+    private String roleType;
+
     private Set<String> permsSet;
 
     /**
@@ -167,6 +171,22 @@ public class SysUserEntity implements Serializable {
         return mobile;
     }
 
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getRoleType() {
+        return roleType;
+    }
+
+    public void setRoleType(String roleType) {
+        this.roleType = roleType;
+    }
+
     /**
      * 设置：状态  0：禁用   1：正常
      *

kmall-common/src/main/resources/mybatis/mapper/SysUserDao.xml

@@ -74,6 +74,8 @@
 			`status`, 
 			`create_user_id`,
 			`dept_id`,
+			`store_id`,
+			`role_type`,
 			`create_time`
 		)
 		values
@@ -86,6 +88,8 @@
 			#{status}, 
 			#{createUserId},
 			#{deptId},
+			#{storeId},
+			#{roleType},
 			#{createTime}
 		)
 	</insert>
@@ -99,6 +103,8 @@
 			<if test="mobile != null">`mobile` = #{mobile}, </if>
 			<if test="status != null">`status` = #{status}, </if>
 			<if test="deptId != null">`dept_id` = #{deptId}, </if>
+			<if test="storeId != null">`store_id` = #{storeId}, </if>
+			<if test="roleType != null">`role_type` = #{roleType}, </if>
 		</set>
 		where user_id = #{userId} 
 		<if test="createUserId != null">