From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
index abf3384..56625c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
@@ -52,6 +52,12 @@
 	 */
 	private List<List<String>> templateContent;
 
+
+	/**
+	 * 合并内容（短信内容）--临时
+	 */
+	private List<List<String>> templateMergeContent;
+
 	/**
 	 * 类型 1：遍历发送  2：批量发送（一次发多个）
 	 */
@@ -63,6 +69,11 @@
 	private SmsTemplate smsTemplate;
 
 	/**
+	 * 短信模板对象信息(合并的模板)
+	 */
+	private SmsTemplate smsTemplateMerge;
+
+	/**
 	 * 是否发送站内信
 	 */
 	private Boolean isSendStation;

--
Gitblit v1.9.3