Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 cd45ac2fa0097de2fd9bf637fc5a23593be1aef0

 cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java

@@ -65,6 +65,7 @@
    private Integer otherId;



    @Override
    protected Serializable pkVal() {
        return this.id;