From 1a438691fdad75bf7b26202cee792c1b8f8c208e Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 23 十月 2026 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
basic-server/src/main/resources/mapper/StandardTemplateMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
index a3d74b0..871f1a2 100644
--- a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -9,6 +9,7 @@
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="thing" column="thing" jdbcType="VARCHAR"/>
+ <result property="standardRequirement" column="standard_requirement" jdbcType="VARCHAR"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -17,7 +18,7 @@
<select id="selectStandardTemplatePageList" resultType="com.ruoyi.basic.pojo.StandardTemplate">
select * from (
- select st.id, st.name,st.number, st.price, st.remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
+ select st.id, st.name,st.number, st.standard_requirement, st.price, st.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