From 15b55458ee0516748bf472d8f228d19c1d323731 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 13 十一月 2023 14:55:01 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
index 0094730..b8624b8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -12,13 +12,22 @@
/******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
+ /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭～椤�*/
+ private Integer type;
+ /**瀹℃牳绫诲瀷鍞竴瀛楃涓� -蹇呭～椤�*/
+ private String typeStr;
+ /**瀹℃牳鏍囬 -蹇呭～椤�*/
+ private String title;
+ /**瀹℃牳鍞竴鏍囪瘑 -蹇呭～椤�*/
+ private String uniqueId;
+
/**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
private MarketingContentDto marketingContentDto;
/**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
private MarketingMsgDto marketingMsgDto;
- /**鍥炶皟閾炬帴 -蹇呭～椤�*/
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
private String callbackUrl;
}
--
Gitblit v1.8.0