From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index fdb98a9..6ff579f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -25,7 +25,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
- private String id;
+ private List<String> idList;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
@@ -51,4 +51,9 @@
/** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
private Integer isMarketApply = 0;
+
+ /** 浼樻儬鍒稿垎绫籌D*/
+ private String couponTypeId;
+ /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+ private String type;
}
--
Gitblit v1.8.0