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

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

 cloud-server-other/src/main/java/com/dsh/other/model/StoreDetailsVo.java

@@ -35,7 +35,7 @@


    @Data
    public static class Site{
    public static class Site {

        @ApiModelProperty(value = "场地id")
        private Integer siteId;