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

无关风月

1 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 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;