From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 19 +++++++++++++++++--
1 files changed, 17 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 6dfcd7b..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
@@ -15,8 +17,21 @@
/**鍙戞斁鏁伴噺-蹇呭～*/
private Integer num;
- /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,涓嶅～榛樿涓�涓湀*/
+ /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
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