From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +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 | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 877477b..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
@@ -19,7 +19,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 门店id
@@ -36,6 +36,8 @@
*/
@TableField("siteTypeId")
private Integer siteTypeId;
+ @TableField("isCanBeBooked")
+ private Integer isCanBeBooked;
/**
* 城市管理员id
*/
@@ -61,6 +63,7 @@
*/
@TableField("cityCode")
private String cityCode;
+
/**
* 预约开始时间
*/
@@ -106,7 +109,30 @@
* 添加时间
*/
@TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @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