From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java |   15 +++++++++++++++
 1 files changed, 15 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..4aae7d2 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,17 @@
     private String startTime;
     /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
+    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+    private String costDeptName;
+    /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+    private String ascrCostDeptName;
+
+    /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/
+    private String sendReason;
+    /**鍙戞斁闂ㄥ簵 -闈炲繀濉� */
+    private String sendShopId;
+    /**鍙戞斁闂ㄥ簵鍚嶇О*/
+    private String sendShopName;
+    /** 鎵撴澘鍒告湁鏃犺倴鍍忔潈鍗忚 0=鍚� 1=鏄�*/
+    private Integer isPortrait;
 }

--
Gitblit v1.8.0