From 8451f8d8cc95b45ddac57b3936bce13425031269 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 18:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml b/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml
index 786e5b1..54c68bf 100644
--- a/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -15,14 +15,9 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,name,remark,
- thing,create_user,update_user,
- create_time,update_time
- </sql>
<select id="selectStandardTemplatePageList" resultType="com.yuanchu.mom.pojo.StandardTemplate">
select * from (
- select st.id, st.name, remark, thing, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
+ select st.id, st.name, remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
from standard_template st
left join user u2 on u2.id = st.create_user
left join user u3 on u3.id = st.update_user
--
Gitblit v1.9.3