From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/SealMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
index 0ae0d6e..c1e4380 100644
--- a/cnas-server/src/main/resources/mapper/SealMapper.xml
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -3,14 +3,15 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
- <select id="selectSeal" resultType="com.yuanchu.mom.mapper.SealMapper">
- select s.address,s.type,u.`name`,s.create_time
- from seal s
- LEFT JOIN `user` u
- on s.create_user=u.id
+ <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
+ select * from seal
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
-
+ <select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory">
+ SELECT *
+ from laboratory
+ WHERE id =#{labId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3