Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-01 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc

 cloud-server-other/src/main/java/com/dsh/other/entity/Site.java

@@ -64,12 +64,12 @@
     * 预约开始时间
     */
    @TableField("appointmentStartTime")
    private Date appointmentStartTime;
    private String appointmentStartTime;
    /**
     * 预约结束时间
     */
    @TableField("appointmentEndTime")
    private Date appointmentEndTime;
    private String appointmentEndTime;
    /**
     * 现金价格（x/半小时）
     */