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

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -335,8 +335,9 @@ public class WarrantServiceImpl implements WarrantService {
         sb.append("<xml>");
         sb.append("<ToUserName><![CDATA["+toUserName+"]]></ToUserName>");
         sb.append("<FromUserName><![CDATA["+fromUserName+"]]></FromUserName>");
-        sb.append("<CreateTime><![CDATA["+createTime+"]]></CreateTime>");
-        sb.append("<MsgType><![CDATA[text]]></MsgType>");
+//        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();