From 920227e89425e284e522274ce28f267ed0c50655 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 26 Mar 2024 11:45:28 +0800
Subject: [PATCH] 添加字段+用户名修改成住户名称
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2 +-
src/main/java/org/springblade/modules/article/entity/Article.java | 2 +-
src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml | 4 ++++
src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java | 5 +++++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index 517532b..6796d91 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -92,7 +92,7 @@
/** 更新时间 */
@ApiModelProperty(value = "更新时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("update_time")
+ @TableField(value = "update_time",fill = FieldFill.UPDATE)
private Date updateTime;
/** 更新人 */
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 72243e3..1374999 100644
--- a/src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java
+++ b/src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java
@@ -137,5 +137,10 @@
@TableField("attachment")
private String attachment;
+ /** 最少可选数量 */
+ @ApiModelProperty(value = "最少可选数量", example = "")
+ @TableField("option_number_min")
+ private Integer optionNumberMin;
+
}
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 b09680d..3ac212f 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -22,6 +22,7 @@
<result property="optionNumber" column="option_number" />
<result property="mandatoryFlag" column="mandatory_flag" />
<result property="attachment" column="attachment" />
+ <result property="optionNumberMin" column="option_number_min" />
</resultMap>
@@ -42,6 +43,7 @@
<result property="selected" column="selected" />
<result property="articleId" column="article_id" />
<result property="optionNumber" column="option_number" />
+ <result property="optionNumberMin" column="option_number_min" />
<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">
@@ -77,6 +79,7 @@
selected,
article_id,
option_number,
+ option_number_min,
mandatory_flag,
attachment
from
@@ -103,6 +106,7 @@
jt.article_id,
jt.LEVEL,
jt.option_number,
+ jt.option_number_min,
jt.mandatory_flag,
jt.attachment,
( SELECT
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 52aaf2d..0b87927 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -242,7 +242,7 @@
bu.code,
bu.user_type,
bu.account,
- bu.name,
+ jh.name,
bu.real_name,
bu.avatar,
bu.email,
--
Gitblit v1.9.3