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

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

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

@@ -59,7 +59,7 @@
    @TableField("gameId")
    private Integer gameId;


    @TableField("otherId")
    private Integer otherId;

    @Override