From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 10:46:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置

---
 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