From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-other/src/main/java/com/dsh/other/entity/Store.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
index ecee130..0a50bf9 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -36,82 +37,102 @@
     /**
      * 门店名称
      */
+    @TableField("name")
     private String name;
     /**
      * 门店店长id
      */
+    @TableField("storeStaffId")
     private Integer storeStaffId;
     /**
      * 城市管理员id
      */
+    @TableField("cityManagerId")
     private Integer cityManagerId;
     /**
      * 省
      */
+    @TableField("province")
     private String province;
     /**
      * 省编号
      */
+    @TableField("provinceCode")
     private String provinceCode;
     /**
      * 市
      */
+    @TableField("city")
     private String city;
     /**
      * 市编号
      */
+    @TableField("cityCode")
     private String cityCode;
     /**
      * 联系电话
      */
+    @TableField("phone")
     private String phone;
     /**
      * 详细地址
      */
+    @TableField("address")
     private String address;
     /**
      * 纬度
      */
+    @TableField("lat")
     private String lat;
     /**
      * 经度
      */
+    @TableField("lon")
     private String lon;
     /**
      * 营业开始时间
      */
+    @TableField("startTime")
     private String startTime;
     /**
      * 营业结束时间
      */
+    @TableField("endTime")
     private String endTime;
     /**
      * 封面图
      */
+    @TableField("coverDrawing")
     private String coverDrawing;
     /**
      * 实景图
      */
+    @TableField("realPicture")
     private String realPicture;
     /**
      * 门店介绍
      */
+    @TableField("introduce")
     private String introduce;
     /**
      * 福利图片
      */
+    @TableField("welfarePicture")
     private String welfarePicture;
     /**
      * 开始上课图片
      */
+    @TableField("classPicture")
     private String classPicture;
     /**
      * 评分
      */
+    @TableField("score")
     private BigDecimal score;
     /**
      * 状态（1=正常，2=冻结，3=删除）
      */
+    @TableField("state")
     private Integer state;
 
 

--
Gitblit v1.7.1