From 6409870bc0883f42b36bcf86aad3da088d8c05b7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 25 Sep 2024 23:46:11 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/oms/service/OmsBaseService.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java
index c124836..0fd4f8f 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java
@@ -112,13 +112,14 @@ public class OmsBaseService {
                             快递单号
                             {{character_string3.DATA}}
                             寄件时间
-                            {{date2.DATA}}
+                            {{date2.DATA}} 2011年10月10日
                             备注
                             {{thing6.DATA}}
                           */
 
                          wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("character_string3", dt.getBillCode()));
-                         wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("date2",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybill.getSendDate())));
+
+                         wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("date2",DateUtils.parseDateToStr("yyyy年MM月dd日",emisWaybill.getSendDate())));
 //                         wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("thing6", dt.getContent()));
                          wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("thing6", "尊敬的客户，您寄给"+emisWaybill.getReceiveName()+"的快递已发出，如需查询请点击进入小程序"));
 
@@ -144,7 +145,7 @@ public class OmsBaseService {
 
                          wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("character_string2", dt.getBillCode()));
                          wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("thing1", emisWaybill.getSendName()));
-                         wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("time11",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybill.getSignDate())));
+                         wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData("time11",DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm:ss",emisWaybill.getSignDate())));
 
                      }
                      // 问题件