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

---
 phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 e421cb2..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,9 +12,13 @@
 
     /******MarketingDto缁ф壙瀛楁 -蹇呭~椤�****/
 
-    /**瀹℃牳绫诲瀷 >20鐨勫��*/
+    /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭~椤�*/
     private Integer type;
-    /**瀹℃牳鍞竴鏍囪瘑*/
+    /**瀹℃牳绫诲瀷鍞竴瀛楃涓�  -蹇呭~椤�*/
+    private String typeStr;
+    /**瀹℃牳鏍囬  -蹇呭~椤�*/
+    private String title;
+    /**瀹℃牳鍞竴鏍囪瘑 -蹇呭~椤�*/
     private String uniqueId;
 
     /**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭~椤�*/

--
Gitblit v1.8.0