From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java
index 02e3e18..cafcdc2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java
@@ -41,7 +41,7 @@
@TableField("name")
private String name;
/**
- * 优惠券类型（1=满减券，2=代金券，3=体验券）
+ * 优惠券类型（1=满减券，2=代金券，3=体验券 4=抵扣券）
*/
@TableField("type")
private Integer type;
@@ -108,26 +108,6 @@
@TableField("useScope")
private Integer useScope;
/**
- * 省
- */
- @TableField("province")
- private String province;
- /**
- * 省编号
- */
- @TableField("provinceCode")
- private String provinceCode;
- /**
- * 市
- */
- @TableField("city")
- private String city;
- /**
- * 市编号
- */
- @TableField("cityCode")
- private String cityCode;
- /**
* 审核状态（1=待审核，2=已通过，3=已拒绝）
*/
@TableField("auditStatus")
@@ -168,6 +148,21 @@
*/
@TableField("productImages")
private String productImages;
+ /**
+ * 发布人类型 1=城市管理者 2=平台管理者
+ */
+ @TableField("publisherType")
+ private Integer publisherType;
+ /**
+ * 城市管理者id
+ */
+ @TableField("cityManagerId")
+ private Integer cityManagerId;
+ /**
+ * 积分商品id
+ */
+ @TableField("goodsId")
+ private Integer goodsId;
@Override
--
Gitblit v1.7.1