From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +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 |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 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 fe57f32..c6b09b9 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")
@@ -158,6 +138,26 @@
     @TableField("insertTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
+    /**
+     * 封面图
+     */
+    @TableField("cover")
+    private String cover;
+    /**
+     * 图片
+     */
+    @TableField("productImages")
+    private String productImages;
+    /**
+     * 发布人类型 1=城市管理者 2=平台管理者
+     */
+    @TableField("publisherType")
+    private Integer publisherType;
+    /**
+     * 城市管理者id
+     */
+    @TableField("cityManagerId")
+    private Integer cityManagerId;
 
 
     @Override

--
Gitblit v1.7.1