From 2fd7ab1738baaa1bfd49e38cea13dc06ff7429ad Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 14 九月 2023 09:59:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
index c1cf034..34912e0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -21,7 +21,8 @@
     private String startTime;
     /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
-
-    /**鍙戦�佺殑鐢ㄦ埛-蹇呭~*/
-    private List<CouponSendUserDto> sendUserList;
+    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+    private String costDeptName;
+    /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+    private String ascrCostDeptName;
 }

--
Gitblit v1.8.0