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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

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

@@ -11,6 +11,6 @@
public class CityGame {
    private int code;
    private String message;
    private List<CityGameData> data;
    private CityGameData data;
    private String nextUrl;
}