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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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;
}