From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 b08eb3c..2fd860d 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
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 浼樻儬鍒稿彂閫佸弬鏁�
  * @author fwq
@@ -19,4 +21,15 @@
     private String startTime;
     /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
+    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+    private String costDeptName;
+    /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+    private String ascrCostDeptName;
+
+    /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/
+    private String sendReason;
+    /**鍙戞斁闂ㄥ簵 -闈炲繀濉� */
+    private String sendShopId;
+    /**鍙戞斁闂ㄥ簵鍚嶇О*/
+    private String sendShopName;
 }

--
Gitblit v1.8.0