From 6939a2e9d54f37bbe58572942105f9f65e5132fd Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 16 八月 2023 14:40:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 9 ++++++++-
1 files changed, 8 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 af91597..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
@@ -10,13 +10,20 @@
@Data
public class MarketingTotalDto extends MarketingDto {
+ /******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
+
+ /**瀹℃牳绫诲瀷 >20鐨勫��*/
+ private Integer type;
+ /**瀹℃牳鍞竴鏍囪瘑*/
+ private String uniqueId;
+
/**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
private MarketingContentDto marketingContentDto;
/**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
private MarketingMsgDto marketingMsgDto;
- /**鍥炶皟閾炬帴 -蹇呭～椤�*/
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
private String callbackUrl;
}
--
Gitblit v1.8.0