From 023a48ec1e02c80859d56782eb0f2323f8decae3 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 11 四月 2024 19:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-治疗屏用户资料卡' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 4aae7d2..6469b17 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,10 +21,13 @@
     private String startTime;
     /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
-    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
-    private String costDeptName;
+    /**褰掑睘鎴愭湰閮ㄩ棬 -闈炲繀濉� */
+    private String ascrCostDeptId;
     /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
     private String ascrCostDeptName;
+    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+    private String costDeptName;
+
 
     /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/
     private String sendReason;

--
Gitblit v1.8.0