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

无关风月

7 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

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

    private Integer state;