From 05861c947332f646e713e1ffbb701cee0ca350d9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 10 十一月 2023 18:55:30 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 4 +++-
1 files changed, 3 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 6746e14..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,8 +12,10 @@
/******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
- /**瀹℃牳绫诲瀷 >1000鐨勫��*/
+ /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭～椤�*/
private Integer type;
+ /**瀹℃牳绫诲瀷鍞竴瀛楃涓� -蹇呭～椤�*/
+ private String typeStr;
/**瀹℃牳鏍囬 -蹇呭～椤�*/
private String title;
/**瀹℃牳鍞竴鏍囪瘑 -蹇呭～椤�*/
--
Gitblit v1.8.0