Merge remote-tracking branch 'origin/master'

nickchange

2023-10-16 6593a67fdfb688c70365b419c0e9658c690524b5

 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;