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

无关风月

1 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

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

@@ -8,5 +8,6 @@
    String cityCode;
    String store;
    String site;

    Integer type;
    Integer id;
}