From e2e97b3153d4c2e052763ffed3710e12848c995d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 17 二月 2023 20:41:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java
index e4cee29..760504b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java
@@ -75,6 +75,18 @@
     @TableField("coupon_send_quantity")
     private Integer couponSendQuantity;
 
+    @ApiModelProperty(value = "是否冻结 1正常 2冻结")
+    @TableField("coupon_state")
+    private Integer couponState;
+
+    public Integer getCouponState() {
+        return couponState;
+    }
+
+    public void setCouponState(Integer couponState) {
+        this.couponState = couponState;
+    }
+
     public Integer getCouponValidity() {
         return couponValidity;
     }

--
Gitblit v1.7.1