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

无关风月

1 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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