From 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 十月 2023 17:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 15 +++++++++++++--
1 files changed, 13 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..d18fdee 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,17 @@
/**鍙戞斁鏁伴噺-蹇呭～*/
private Integer num;
- /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,涓嶅～榛樿涓�涓湀*/
+ /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
private String startTime;
- /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,涓嶅～榛樿涓�涓湀*/
+ /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
private String endTime;
+ /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+ private String costDeptName;
+ /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+ private String ascrCostDeptName;
+
+ /**鍙戞斁绫诲瀷 */
+ private Integer belongType;
+ /**鍙戞斁闂ㄥ簵*/
+ private String sendShopId;
}
--
Gitblit v1.8.0