From 99ffdf25456cd2d9bb90d275d00257cdd8cfc879 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 13 十一月 2023 10:08:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 2 +-
1 files changed, 1 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 880de26..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,7 +12,7 @@
/******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
- /**瀹℃牳绫诲瀷 >1000鐨勫�� -蹇呭～椤�*/
+ /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭～椤�*/
private Integer type;
/**瀹℃牳绫诲瀷鍞竴瀛楃涓� -蹇呭～椤�*/
private String typeStr;
--
Gitblit v1.8.0