From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java b/src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java
index 7f22016..c95e56b 100644
--- a/src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java
+++ b/src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java
@@ -21,7 +21,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
import java.io.Serializable;
import java.util.Date;
@@ -51,8 +50,8 @@
/** 选项 0：单 1多 */
@ApiModelProperty(value = "选项 0：单 1多", example = "")
- @TableField("option")
- private Integer option;
+ @TableField("option_range")
+ private Integer optionRange;
/** 排序 */
@ApiModelProperty(value = "排序", example = "")
@@ -93,7 +92,7 @@
/** 0否 1是 */
@ApiModelProperty(value = "0否 1是", example = "")
@TableField("delete_flag")
- @TableLogic
+// @TableLogic
private Integer deleteFlag;
/** 公益报名与议事表id */
@@ -106,9 +105,20 @@
@TableField("parent_id")
private Integer parentId;
- /** 层级 */
+ /**
+ * 层级
+ */
@ApiModelProperty(value = "层级", example = "")
@TableField("level")
private Integer level;
+
+ @ApiModelProperty(value = "选中", example = "")
+ @TableField("selected")
+ private String selected;
+
+
+ @ApiModelProperty(value = "文章id", example = "")
+ @TableField("article_id")
+ private Integer articleId;
}
--
Gitblit v1.9.3