From 5b233730cac71e52b60b06335e5b0fb18c9b0c13 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 4 Aug 2020 16:04:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9ActCustomizedConstant?=
 =?UTF-8?q?=EF=BC=8CTITLE=5FNAME=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/constant/ActCustomizedConstant.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActCustomizedConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActCustomizedConstant.java
index e097fcd814..e43f3076eb 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActCustomizedConstant.java
+++ b/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 = "爱心互助";
 
     /**
      * 咨询热线

From 01b85de421f9234b44d725a0bb6e3f93e1a48397 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 16:07:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DraftCoverDao.xml     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
index ffd2aa3488..104d6c7126 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
+++ b/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">

From f5bcc430952b0a9961108e734408d6a7213e796e Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 4 Aug 2020 16:11:03 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oper-crm-server/src/main/resources/mapper/CustomerDao.xml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index 1065535489..1e1c8649d1 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/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'

From 1cef9c61c2db4edb66cbd8d3b84578f220e4f869 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 16:12:13 +0800
Subject: [PATCH 4/5] voice   +1     63

---
 .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml    | 2 +-
 epmet-module/gov-voice/gov-voice-server/pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
index aeedb43eb9..420db4a97e 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/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 # 使用现有网络
diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index d6d206c95a..517c13c9a7 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/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>

From 3a1de619f297272beb90e8ba24cca6629ecc88c7 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 4 Aug 2020 16:16:09 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=83=A8=E7=BD=B2crm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
index ecd9f3dc51..5a5aacc465 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.60
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.61
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 5eade0d793..dc4ea9d3fb 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-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.60</version>
+    <version>0.3.61</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>