From c52f83ef5f702b3c178881d3eee72267c77e7751 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:26:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 46d4e4a..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,7 @@
* 添加时间
*/
@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;
@@ -130,4 +133,6 @@
private String ids;
@TableField("sign")
private Integer sign;
+ @TableField("reservation")
+ private Integer reservation;
}
--
Gitblit v1.7.1