Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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;

    /**
     * 预约开始时间
     */