From fc21611953ae0ca23f76f4836e2eb000ad22e731 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期四, 19 十月 2023 16:17:44 +0800 Subject: [PATCH] Merge branch 'rx-1016-执行指标报表' into master-prod-new --- 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 62b5ecf..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<CouponSendItemDto> couponList; + /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/ + private String costDeptName; + /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */ + private String ascrCostDeptName; } -- Gitblit v1.8.0