From 4c3685ea4fb7365382df29d18b6c8349d476695a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 21 三月 2024 16:32:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
index 38e493f..fb8674c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -15,6 +15,7 @@
<result column="nick_name" property="auditingUserName" />
<result column="rule_name" property="defaultRuleName" />
<result column="unit_name" property="unitName" />
+ <result column="create_by" property="createBy" />
</resultMap>
<select id="page" resultMap="BaseResultMap">
@@ -29,6 +30,7 @@
tda.auditing_time,
tda.auditing_user,
su.nick_name,
+ tda.create_by,
(SELECT unit_name FROM t_yw_unit WHERE id = tdr.unit_id AND deleted = 0) as unit_name,
(SELECT rule_name FROM t_default_rule WHERE id = tdr.default_rule_id AND deleted = 0) as rule_name
FROM
--
Gitblit v1.8.0