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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

 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;

}