From b6e3ddd1cfc4d7aff9b1356d2c67f8d32c30393b Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 7 Aug 2020 17:59:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index aaecc89036..c4678d66cd 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.112
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.113
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index fb079f2cd3..6b4dbb7a3d 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/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.112</version>
+    <version>0.3.113</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 2d16a44d1cf78f2583cfcc7f9da6e67fb7e6f294 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 7 Aug 2020 18:13:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=A8=E7=BD=91=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/WarrantServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
index efdcb4c96f..3d4bf7fd62 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@@ -312,9 +312,9 @@ public class WarrantServiceImpl implements WarrantService {
         sb.append("<xml>");
         sb.append("<ToUserName><![CDATA["+toUserName+"]]></ToUserName>");
         sb.append("<FromUserName><![CDATA["+fromUserName+"]]></FromUserName>");
-        sb.append("<CreateTime>"+createTime+"</CreateTime>");
-        sb.append("<Content><![CDATA["+content+"]]></Content>");
+        sb.append("<CreateTime><![CDATA["+createTime+"]]></CreateTime>");
         sb.append("<MsgType><![CDATA[text]]></MsgType>");
+        sb.append("<Content><![CDATA["+content+"]]></Content>");
         sb.append("</xml>");
         String replyMsg = sb.toString();
         log.info(String.format(ThirdRunTimeInfoConstant.SEND_MESSAGE_XML,replyMsg));

From 55565722c1c6f7974244596054ad6898cb927908 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 7 Aug 2020 18:14:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index 3086bd316e..85e0adfe1b 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.109
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.110
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 2ebec8bbf9..4cb37c7143 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-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.109</version>
+    <version>0.0.110</version>
 
     <parent>
         <groupId>com.epmet</groupId>