Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 c5cb162b5cbdb589e97290fba3ac3e9241ec48d4

 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/半小时）
     */