From e77e096fbfcc1bf525b9ea3382a26abe111c957d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 05 三月 2026 18:03:42 +0800
Subject: [PATCH] 更改头部
---
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
index 7096e11..aed2eff 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
@@ -200,11 +200,6 @@
paramMap.put("template_id", "vdIPfwvDCrXOHgQnB6sdE1lGEsJm1oUURfLx6SoLdk0");
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
-
-<<<<<<< HEAD
-=======
-
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
SmsEmail smsEmail = new SmsEmail();
smsEmail.setPhone(openId);
smsEmail.setRemark("绛夊緟鍙戦��");
@@ -218,14 +213,7 @@
Integer endMin= Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.OVER_NOTICE_WX).getCode());
smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getEndTime(),-endMin),"yyyy-MM-dd HH:mm:ss"));
smsEmail.setContent(JSONObject.toJSONString(paramMap));
-<<<<<<< HEAD
smsEmailMapper.insert(smsEmail);
-=======
-
- smsEmailMapper.insert(smsEmail);
-
-
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
}
--
Gitblit v1.9.3