From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
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 d31b318..5cb3595 100644
--- a/basic-server/src/main/resources/mapper/SealMapper.xml
+++ b/basic-server/src/main/resources/mapper/SealMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.SealMapper">
- <select id="selectSeal" resultType="com.ruoyi.inspect.pojo.Seal">
+ <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
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -11,7 +11,7 @@
</if>
</select>
- <select id="selectLaboratory" resultType="com.ruoyi.inspect.pojo.Laboratory">
+ <select id="selectLaboratory" resultType="com.ruoyi.basic.pojo.Laboratory">
SELECT *
from laboratory
WHERE id = #{labId}
--
Gitblit v1.9.3