From f604f87781d7cdae5571465a3bafffff53313028 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 08:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/CouponWarpper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/CouponWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/CouponWarpper.java
index c221b3a..b9770b1 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/CouponWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/CouponWarpper.java
@@ -11,6 +11,8 @@
 @Data
 @ApiModel
 public class CouponWarpper {
+    @ApiModelProperty("优惠券id")
+    private Integer id;
     @ApiModelProperty("满金额")
     private Double couponConditionalAmount;
     @ApiModelProperty("优惠金额")

--
Gitblit v1.7.1