Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

 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