From 95c08b4b0a31fcf5ae14ffea6337fb5da6718e1c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 21 三月 2024 10:38:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java | 8 ++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java | 8 ++++++++
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 4 ++++
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
index f6add46..04b1b88 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
@@ -27,6 +29,12 @@
@TableField("default_id")
private Integer defaultId;
+ @TableField("score")
+ private BigDecimal score;
+
+ @TableField("check_publish_id")
+ private Integer checkPublishId;
+
@ApiModelProperty("瀹℃牳鐘舵��")
@TableField("auditing_status")
private String auditingStatus;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
index da99993..ce9cc46 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
@@ -3,6 +3,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.DefaultAuditing;
+
+import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
@@ -25,6 +27,12 @@
/** 杩濊 */
private Integer defaultId;
+ /** 杩濊鎵ｅ垎 */
+ private BigDecimal score;
+
+ /** 鑰冩牳鍙戝竷ID */
+ private Integer checkPublishId;
+
/**
* 杩濈害瑙勫垯鍚�
*/
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
index 49132a1..38e493f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -6,6 +6,8 @@
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO">
<result column="id" property="id" />
<result column="create_time" property="createTime" />
+ <result column="score" property="score" />
+ <result column="check_publish_id" property="checkPublishId" />
<result column="default_id" property="defaultId" />
<result column="auditing_status" property="auditingStatus" />
<result column="remark" property="remark" />
@@ -18,6 +20,8 @@
<select id="page" resultMap="BaseResultMap">
SELECT
tda.id,
+ tda.score,
+ tda.check_publish_id,
tda.create_time,
tda.default_id,
tda.auditing_status,
--
Gitblit v1.8.0