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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

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

@@ -10,6 +10,7 @@

import java.io.Serializable;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -70,6 +71,9 @@
    private String intro;
    @TableField(exist = false)
    private String video;
    @TableField(exist = false)
    @ApiModelProperty("游戏类型（1=普通游戏，2=世界杯）")
    private Integer gameType;


    @Override