From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java | 220 +++++++++++++++++++++---------------------------------
1 files changed, 87 insertions(+), 133 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
index 7272eb9..d6249d0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
@@ -1,180 +1,134 @@
package com.dsh.guns.modular.system.model;
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;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
-import java.io.Serializable;
import java.util.Date;
/**
- * <p>
- * 线路站点
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-04
+ * @author zhibing.pu
+ * @Date 2023/8/1 17:43
*/
+@Data
@TableName("t_site")
-public class TSite extends Model<TSite> {
-
- private static final long serialVersionUID = 1L;
-
+public class TSite {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 站点名称
+ * 门店id
*/
+ @TableField("storeId")
+ private Integer storeId;
+ /**
+ * 场地名称
+ */
+ @TableField("name")
private String name;
/**
- * 省名称
+ * 场地类型id
*/
+ @TableField("siteTypeId")
+ private Integer siteTypeId;
+ /**
+ * 城市管理员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;
/**
- * 区县名称
+ * 预约开始时间
*/
- private String district;
+ @TableField("appointmentStartTime")
+ private String appointmentStartTime;
/**
- * 区县编号
+ * 预约结束时间
*/
- private String districtCode;
+ @TableField("appointmentEndTime")
+ private String appointmentEndTime;
/**
- * 状态（1=正常，2=冻结，3=删除）1:normal 2:freeze 3:delete
+ * 现金价格（x/半小时）
*/
+ @TableField("cashPrice")
+ private Double cashPrice;
+ /**
+ * 玩湃币价格（x/半小时）
+ */
+ @TableField("playPaiCoin")
+ private Integer playPaiCoin;
+ /**
+ * 场地责任险有效期
+ */
+ @TableField("insuranceEndTime")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date insuranceEndTime;
+ /**
+ * 场地责任险图片
+ */
+ @TableField("insuranceImg")
+ private String insuranceImg;
+ /**
+ * 消防应急管理方案
+ */
+ @TableField("managementPlan")
+ private String managementPlan;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
private Integer state;
/**
* 添加时间
*/
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date insertTime;
- /**
- * 添加人id
- */
- private Integer insertUserId;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getProvince() {
- return province;
- }
-
- public void setProvince(String province) {
- this.province = province;
- }
-
- public String getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(String provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(String cityCode) {
- this.cityCode = cityCode;
- }
-
- public String getDistrict() {
- return district;
- }
-
- public void setDistrict(String district) {
- this.district = district;
- }
-
- public String getDistrictCode() {
- return districtCode;
- }
-
- public void setDistrictCode(String districtCode) {
- this.districtCode = districtCode;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUserId() {
- return insertUserId;
- }
-
- public void setInsertUserId(Integer insertUserId) {
- this.insertUserId = insertUserId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSite{" +
- "id=" + id +
- ", name=" + name +
- ", province=" + province +
- ", provinceCode=" + provinceCode +
- ", city=" + city +
- ", cityCode=" + cityCode +
- ", district=" + district +
- ", districtCode=" + districtCode +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", insertUserId=" + insertUserId +
- "}";
- }
+ @TableField("operatorId")
+ private Integer operatorId;
+ @TableField("typeName")
+ private String typeName;
+ @TableField("nextName")
+ private String nextName;
+ @TableField("ishalf")
+ private Integer ishalf;
+ @TableField("cashPriceOne")
+ private Double cashPriceOne;
+ @TableField("playPaiCoinOne")
+ private Double playPaiCoinOne;
+ @TableField("halfName")
+ private String halfName;
+ @TableField("introduce")
+ private String introduce;
+ @TableField("imgs")
+ private String imgs;
+ @TableField("ids")
+ private String ids;
+ @TableField("sign")
+ private Integer sign;
}
--
Gitblit v1.7.1