diff --git a/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java b/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java
index 3fe7fd0..d79884f 100644
--- a/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java
@@ -73,10 +73,10 @@ public class SocketIOConfig implements InitializingBean {
         config.setKeyStorePassword("123456");  // 设置证书密码
 
     // 启动socket服务
-    SocketIOServer server = new SocketIOServer(config);
-    server.addListeners(socketIOHandler);
-    server.start();
-    ClientCache.setSocketIOServer(server);
-    logger.debug("Netty SocketIO启动：{}:{}",host,port);
+//    SocketIOServer server = new SocketIOServer(config);
+//    server.addListeners(socketIOHandler);
+//    server.start();
+//    ClientCache.setSocketIOServer(server);
+//    logger.debug("Netty SocketIO启动：{}:{}",host,port);
   }
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index e8d7267..235becd 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -158,6 +158,10 @@ public class User implements UserDetails {
     @ApiModelProperty(value = "商户ID")
     private Integer merchantId;
 
+    @ApiModelProperty(value = "商户名称")
+    @TableField(exist = false)
+    private String merchantName;
+
     @ApiModelProperty(value = "是否管理员")
     private Boolean isAdmin;
 
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index 69644ce..f36bfb4 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -26,7 +26,8 @@
     <sql id="selectSql">
         SELECT a.*,
         b.organization_name,
-        c.dict_data_name sex_name
+        c.dict_data_name sex_name,
+        e.merchant_name as merchantName
         FROM sys_user a
         LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
         LEFT JOIN (
@@ -35,6 +36,7 @@
         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}
@@ -133,6 +135,7 @@
               AND (
               a.username = #{param.keywords}
               OR a.user_id = #{param.keywords}
+              OR a.merchant_id = #{param.keywords}
               OR a.nickname LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.phone = #{param.keywords}