From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index f6810d7..867ce75 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -18,7 +19,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 门店id
@@ -35,6 +36,8 @@
*/
@TableField("siteTypeId")
private Integer siteTypeId;
+ @TableField("isCanBeBooked")
+ private Integer isCanBeBooked;
/**
* 城市管理员id
*/
@@ -60,16 +63,17 @@
*/
@TableField("cityCode")
private String cityCode;
+
/**
* 预约开始时间
*/
@TableField("appointmentStartTime")
- private Date appointmentStartTime;
+ private String appointmentStartTime;
/**
* 预约结束时间
*/
@TableField("appointmentEndTime")
- private Date appointmentEndTime;
+ private String appointmentEndTime;
/**
* 现金价格（x/半小时）
*/
@@ -84,6 +88,7 @@
* 场地责任险有效期
*/
@TableField("insuranceEndTime")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date insuranceEndTime;
/**
* 场地责任险图片
@@ -100,5 +105,34 @@
*/
@TableField("state")
private Integer state;
-
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
+ @TableField("operatorId")
+ private Integer operatorId;
+ @TableField("typeName")
+ private String typeName;
+ @TableField("imgs")
+ private String imgs;
+ @TableField("introduce")
+ private String introduce;
+ @TableField("ishalf")
+ private Integer ishalf;
+ @TableField("nextName")
+ private String nextName;
+ @TableField("halfName")
+ private String halfName;
+ @TableField("cashPriceOne")
+ private Double cashPriceOne;
+ @TableField("playPaiCoinOne")
+ private Double playPaiCoinOne;
+ @TableField("ids")
+ private String ids;
+ @TableField("sign")
+ private Integer sign;
+ @TableField("reservation")
+ private Integer reservation;
}
--
Gitblit v1.7.1