From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 ec100db..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
@@ -36,6 +36,8 @@
*/
@TableField("siteTypeId")
private Integer siteTypeId;
+ @TableField("isCanBeBooked")
+ private Integer isCanBeBooked;
/**
* 城市管理员id
*/
@@ -61,11 +63,7 @@
*/
@TableField("cityCode")
private String cityCode;
- /**
- * 是否可预约（0=否，1=是）
- */
- @TableField("isCanBeBooked")
- private Integer isCanBeBooked;
+
/**
* 预约开始时间
*/
@@ -135,4 +133,6 @@
private String ids;
@TableField("sign")
private Integer sign;
+ @TableField("reservation")
+ private Integer reservation;
}
--
Gitblit v1.7.1