用户表新增商户名称字段

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -159,7 +159,6 @@ public class User implements UserDetails {
     private Integer merchantId;
 
     @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
     private String merchantName;
 
     @ApiModelProperty(value = "是否管理员")

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -26,8 +26,7 @@
     <sql id="selectSql">
         SELECT a.*,
         b.organization_name,
-        c.dict_data_name sex_name,
-        e.merchant_name as merchantName
+        c.dict_data_name sex_name
         FROM sys_user a
         LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
         LEFT JOIN (
@@ -36,7 +35,6 @@
         LEFT JOIN(
         <include refid="selectUserRoleSql"/>
         ) d ON a.user_id = d.user_id
-        LEFT JOIN sys_merchant e ON a.merchant_id = e.merchant_id
         <where>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}

src/main/java/com/gxwebsoft/common/system/param/UserParam.java

@@ -221,4 +221,11 @@ public class UserParam extends BaseParam {
     @ApiModelProperty("openId")
     @TableField(exist = false)
     private String openId;
+
+    @ApiModelProperty(value = "商户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer merchantId;
+
+    @ApiModelProperty(value = "商户名称")
+    private String merchantName;
 }