From b3a0e5051c2923b5e12b059b6634aa9bd12db59b Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 23 Mar 2024 16:29:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
index 650945c..25d3497 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -11,12 +11,17 @@
<result property="optionContent" column="option_content" />
<result property="optionDetail" column="option_detail" />
<result property="number" column="number" />
- <result property="createTime" column="crete_time" />
+ <result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="deleteFlag" column="delete_flag" />
<result property="publicDiscussId" column="public_discuss_id" />
<result property="parentId" column="parent_id" />
<result property="level" column="level" />
+ <result property="selected" column="selected" />
+ <result property="articleId" column="article_id" />
+ <result property="optionNumber" column="option_number" />
+ <result property="mandatoryFlag" column="mandatory_flag" />
+ <result property="attachment" column="attachment" />
</resultMap>
@@ -35,6 +40,10 @@
<result property="parentId" column="parent_id" />
<result property="level" column="level" />
<result property="selected" column="selected" />
+ <result property="articleId" column="article_id" />
+ <result property="optionNumber" column="option_number" />
+ <result property="mandatoryFlag" column="mandatory_flag" />
+ <result property="attachment" column="attachment" />
<collection property="children" column="id" javaType="list" ofType="org.springblade.modules.discuss.dto.TopicsDTO" select="selectStlCount">
</collection>
@@ -67,7 +76,9 @@
level,
selected,
article_id,
- option_number
+ option_number,
+ mandatory_flag,
+ attachment
from
jczz_topics
</sql>
--
Gitblit v1.9.3