From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09: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 |    5 +++++
 1 files changed, 5 insertions(+), 0 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 9399be5..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,6 +63,7 @@
      */
     @TableField("cityCode")
     private String cityCode;
+
     /**
      * 预约开始时间
      */
@@ -130,4 +133,6 @@
     private String ids;
     @TableField("sign")
     private Integer sign;
+    @TableField("reservation")
+    private Integer reservation;
 }

--
Gitblit v1.7.1