From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java | 31 ++++++++++---------------------
1 files changed, 10 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..6d9629e 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
@@ -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,7 +148,16 @@
*/
@TableField("productImages")
private String productImages;
-
+ /**
+ * 发布人类型 1=城市管理者 2=平台管理者
+ */
+ @TableField("publisherType")
+ private Integer publisherType;
+ /**
+ * 城市管理者id
+ */
+ @TableField("cityManagerId")
+ private Integer cityManagerId;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1