From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/resources/mapper/LaboratoryMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/LaboratoryMapper.xml b/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
index f27f412..c3ab2b4 100644
--- a/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
+++ b/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.LaboratoryMapper">
- <select id="selectItemParameter" resultType="com.ruoyi.inspect.pojo.Laboratory">
+ <select id="selectItemParameter" resultType="com.ruoyi.basic.pojo.Laboratory">
select * from
(
select l.id,
--
Gitblit v1.9.3