Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxActivityServiceImpl.java

@@ -244,7 +244,7 @@ public class ZxActivityServiceImpl implements IZxActivityService {
                 int times = 0;// 循环几个100  用List的长度 除 100
                 int size = phoneList.size(); // 数据数量
                 //会议通知模板id
-                String templateCode = "SMS_465342955";
+                String templateCode = "SMS_469105819";
                 //签名
                 String signName = "潜山市政协办公室";
                 List<String> signNameList = new ArrayList<>();
@@ -279,7 +279,7 @@ public class ZxActivityServiceImpl implements IZxActivityService {
                             phoneNumberJson.append("\"" + phoneList.get(k) + "\",");
                             signNameJson.append("\"" + signName + "\",");
                             /**
-                             * 定于${month}月${day}日（${week}） ${time} 在${place}地点举行${content}活动，请${name}准时参加。
+                             * 定于${month}月${day}日（${week}） ${time} 在${place}召开${content}，请${name}委员准时参加。
                              */
                             templateParamJson.append("{\"month\":\"" + localDate.getMonthValue() + "\",\"day\":\"" + localDate.getDayOfMonth() + "\",\"week\":\"" + localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE) + "\",\"time\":\"" + activityTime +  "\",\"place\":\"" + activityAddress + "\",\"content\":\"" + activityTitle + "\",\"name\":\"" + userNameList.get(k) + "\"},");
                         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxConferenceServiceImpl.java

@@ -240,7 +240,7 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
                 int times = 0;// 循环几个100  用List的长度 除 100
                 int size = phoneList.size(); // 数据数量
                 //会议通知模板id
-                String templateCode = "SMS_465422107";
+                String templateCode = "SMS_469105819";
                 //签名
                 String signName = "潜山市政协办公室";
                 List<String> signNameList = new ArrayList<>();
@@ -275,7 +275,7 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
                             phoneNumberJson.append("\"" + phoneList.get(k) + "\",");
                             signNameJson.append("\"" + signName + "\",");
                             /**
-                             * 定于${month}月${day}日（${week}） ${time} 在${place}地点召开${content}会议，请${name}准时参加。
+                             * 定于${month}月${day}日（${week}） ${time} 在${place}召开${content}，请${name}委员准时参加。
                              */
                             templateParamJson.append("{\"month\":\"" + localDate.getMonthValue() + "\",\"day\":\"" + localDate.getDayOfMonth() + "\",\"week\":\"" + localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE) + "\",\"time\":\"" + conferenceTime +  "\",\"place\":\"" + conferenceAddress + "\",\"content\":\"" + conferenceTitle + "\",\"name\":\"" + userNameList.get(k) + "\"},");
                         }