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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

 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;

}