From 218c85f5128b95cedcc20127c60d1915bb1f7bc6 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 06 三月 2025 16:33:12 +0800 Subject: [PATCH] Merge branch 'dev_zj' into dev --- basic-server/src/main/resources/mapper/SealMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basic-server/src/main/resources/mapper/SealMapper.xml b/basic-server/src/main/resources/mapper/SealMapper.xml index 5cb3595..79e036c 100644 --- a/basic-server/src/main/resources/mapper/SealMapper.xml +++ b/basic-server/src/main/resources/mapper/SealMapper.xml @@ -4,8 +4,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.basic.mapper.SealMapper"> <select id="selectSeal" resultType="com.ruoyi.basic.pojo.Seal"> - select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time - from seal s LEFT JOIN laboratory l on s.lab_id=l.id + select * from (select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time + from seal s LEFT JOIN laboratory l on s.lab_id=l.id) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> -- Gitblit v1.9.3