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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-other/src/main/java/com/dsh/other/entity/BallQueryDto.java

@@ -12,5 +12,7 @@
    String cityCode;
    String store;
    String site;
    Integer type;
    Integer id;

}