Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBooking.java

@@ -178,4 +178,7 @@
    private Integer goType;

    private String money;

    @TableField(exist = false)
    private Integer type;
}