From 1cc34b1ca79017139b79756dcd6247eb47fc41b6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 21 十一月 2023 15:48:52 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 14 ++++++++++++--
1 files changed, 12 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 62b5ecf..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
@@ -21,7 +21,17 @@
private String startTime;
/**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
private String endTime;
+ /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+ private String costDeptName;
+ /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+ private String ascrCostDeptName;
- /**鍙戦�佺殑鍒镐俊鎭�*/
- private List<CouponSendItemDto> couponList;
+ /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/
+ private String sendReason;
+ /**鍙戞斁闂ㄥ簵 -闈炲繀濉� */
+ private String sendShopId;
+ /**鍙戞斁闂ㄥ簵鍚嶇О*/
+ private String sendShopName;
+ /** 鎵撴澘鍒告湁鏃犺倴鍍忔潈鍗忚 0=鍚� 1=鏄�*/
+ private Integer isPortrait;
}
--
Gitblit v1.8.0