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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActCustomizedConstant.java

@@ -11,7 +11,7 @@ public interface ActCustomizedConstant {
     /**
      * 标题：志愿者去哪儿
      */
-    String TITLE_NAME = "志愿者去哪儿";
+    String TITLE_NAME = "爱心互助";
 
     /**
      * 咨询热线

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.62
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.63
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          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.62</version>
+    <version>0.3.63</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml

@@ -13,12 +13,13 @@
         FROM
         DRAFT_COVER cover
         <where>
-        cover.DRAFT_ID = #{draftId}
-        AND cover.DEL_FLAG = 0
-        <if test = 'null != auditStatus and "" != auditStatus'>
-            AND cover.AUDIT_STATUS = #{auditStatus}
-        </if>
-        AND NOT EXISTS ( SELECT 1 FROM DRAFT_COVER WHERE cover.CREATED_TIME <![CDATA[ < ]]> CREATED_TIME )
+            cover.DRAFT_ID = #{draftId}
+            AND cover.DEL_FLAG = 0
+            <if test = 'null != auditStatus and "" != auditStatus'>
+                AND cover.AUDIT_STATUS = #{auditStatus}
+            </if>
+            ORDER BY cover.CREATED_TIME DESC
+            LIMIT 1
         </where>
     </select>
     <select id="selectCoverIdAndUrlByDraftId" resultType="com.epmet.dto.DraftCoverDTO">

epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@@ -72,8 +72,7 @@
     </select>
     <select id="getAllList" resultMap="customerMap">
         SELECT
-            id,customer_name,title,organizationNumber,organizationImg,validityTime,customerAdmin,
-            organizationLevel,logo
+            *
         FROM customer
          WHERE
             del_flag = '0'