From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java b/cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java
index 79e909a..4309c0c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/TGameConfig.java
@@ -1,12 +1,16 @@
package com.dsh.other.entity;
import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -25,7 +29,7 @@
@TableName("t_game_config")
public class TGameConfig extends Model<TGameConfig> {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -63,6 +67,13 @@
private Integer gameId;
@TableField("otherId")
private Integer otherId;
+ @TableField(exist = false)
+ private String intro;
+ @TableField(exist = false)
+ private String video;
+ @TableField(exist = false)
+ @ApiModelProperty("游戏类型（1=普通游戏，2=世界杯）")
+ private Integer gameType;
@Override
--
Gitblit v1.7.1