Merge remote-tracking branch 'origin/dev' into release

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-ext-server:
     container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.6
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.7
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络

epmet-module/epmet-ext/epmet-ext-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.122
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.123
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.122</version>
+    <version>0.3.123</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -228,7 +228,6 @@
             LEFT JOIN user_wechat uw ON uw.user_id = cs.user_id AND uw.del_flag = 0
         WHERE
             cs.del_flag = 0
-            AND cs.active_flag = 'active'
             AND cs.enable_flag = 'enable'
             AND
             <foreach collection="userIds" item="userId" separator="OR">