From b81701324e8db60da4ad46d5f7950dddca702cc7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 11 十二月 2023 17:15:26 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponGoodsDto.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponGoodsDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponGoodsDto.java
index a19db57..3f80aec 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponGoodsDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponGoodsDto.java
@@ -3,6 +3,9 @@
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * 鍟嗗搧鎵╁睍
  * */
@@ -12,6 +15,13 @@
     private String hisId;
     /**绫诲瀷0鍟嗗搧1椤圭洰2淇冮攢3鍗¢」*/
     private String type;
-
+    private String userId;
+    private String commonId;
+    private String couponId;
+    private BigDecimal total;
+    private List<String> ids;
+    private String goodsType;
+    private String keyWord;
+    private Integer useType;
 
 }

--
Gitblit v1.8.0