From 24a92d0c1fd0a96ccdb1fc5b43aafe7ddd68fa93 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 14 十一月 2023 19:09:42 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分

---
 phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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 b8624b8..c6a166e 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,14 +12,15 @@
 
     /******MarketingDto缁ф壙瀛楁 -蹇呭~椤�****/
 
-    /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭~椤�*/
-    private Integer type;
-    /**瀹℃牳绫诲瀷鍞竴瀛楃涓�  -蹇呭~椤�*/
-    private String typeStr;
-    /**瀹℃牳鏍囬  -蹇呭~椤�*/
-    private String title;
+
     /**瀹℃牳鍞竴鏍囪瘑 -蹇呭~椤�*/
     private String uniqueId;
+    /**瀹℃牳鏍囬  -蹇呭~椤�*/
+    private String title;
+    /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject,涓嶅彲閲嶅) -蹇呭~椤�*/
+    private Integer type;
+    /**瀹℃牳绫诲瀷鍞竴瀛楃涓�*/
+    private String typeStr;
 
     /**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭~椤�*/
     private MarketingContentDto marketingContentDto;
@@ -27,7 +28,7 @@
     /**娑堟伅鍙戦�佸唴瀹�  -蹇呭~椤�*/
     private MarketingMsgDto marketingMsgDto;
 
-    /**鍥炶皟閾炬帴  -蹇呭~椤�  鍥炶皟浼犲弬*/
+    /**鍥炶皟閾炬帴  -蹇呭~椤�  鍥炶皟鍙傛暟鍙傝�僊arCommonReturnDto*/
     private String callbackUrl;
 
 }

--
Gitblit v1.8.0