From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 7 ++++++-
1 files changed, 6 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..e421cb2 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,18 @@
/******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
+ /**瀹℃牳绫诲瀷 >20鐨勫��*/
+ private Integer type;
+ /**瀹℃牳鍞竴鏍囪瘑*/
+ private String uniqueId;
+
/**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
private MarketingContentDto marketingContentDto;
/**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
private MarketingMsgDto marketingMsgDto;
- /**鍥炶皟閾炬帴 -蹇呭～椤�*/
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
private String callbackUrl;
}
--
Gitblit v1.8.0