From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 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..1d04f01 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
@@ -39,6 +39,14 @@
@TableField("user_id")
private Integer userId;
+ @ApiModelProperty(value = "代理商id")
+ @TableField("agentId")
+ private Integer agentId;
+
+ @ApiModelProperty(value = "分公司id")
+ @TableField("branchOfficeId")
+ private Integer branchOfficeId;
+
@ApiModelProperty(value = "优惠券名称")
@TableField("coupon_name")
private String couponName;
@@ -75,6 +83,34 @@
@TableField("coupon_send_quantity")
private Integer couponSendQuantity;
+ @ApiModelProperty(value = "是否冻结 1正常 2冻结")
+ @TableField("coupon_state")
+ private Integer couponState;
+
+ public Integer getAgentId() {
+ return agentId;
+ }
+
+ public void setAgentId(Integer agentId) {
+ this.agentId = agentId;
+ }
+
+ public Integer getBranchOfficeId() {
+ return branchOfficeId;
+ }
+
+ public void setBranchOfficeId(Integer branchOfficeId) {
+ this.branchOfficeId = branchOfficeId;
+ }
+
+ public Integer getCouponState() {
+ return couponState;
+ }
+
+ public void setCouponState(Integer couponState) {
+ this.couponState = couponState;
+ }
+
public Integer getCouponValidity() {
return couponValidity;
}
--
Gitblit v1.7.1