From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
index a05323d..fd1491a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
@@ -10,12 +10,14 @@
  * 鍟嗗搧浼樻儬鍒告墿灞�
  * */
 @Data
-public class CouponGoodsDto {
+public class CouponGoodsDto  {
 
     /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
     /**鏍囪瘑*/
     private String commonId;
+    /**浼樻儬鍒告爣璇�*/
+    private String couponId;
 
 
     /**鎬婚噾棰�*/
@@ -24,6 +26,10 @@
     private List<String> ids;
     /**鍟嗗搧绫诲瀷*/
     private String goodsType;
+    /*鎼滅储鍙傛暟*/
+    private String keyWord;
+    //浣跨敤绫诲瀷
+    private Integer useType;
 
 
     /**鍟嗗搧绫诲瀷-椤圭洰*/

--
Gitblit v1.8.0