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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 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