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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -80,7 +80,9 @@
     * 红方id
     */
    private String red;
    @TableField(exist=false)
    private String blueName;
    @TableField(exist=false)
    private String redName;

    private Integer state;