From dfacb4e315a49f2c0399574ef094c87b96e7e248 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 24 七月 2025 09:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ywx_ztns' into dev_ywx_ztns
---
cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml b/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml
index bb2454d..4b62f5b 100644
--- a/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceBorrowMapper.xml
@@ -6,7 +6,7 @@
select * from (
select db.*,device_name
from device_borrow db
- left join `center-lims`.device on db.device_id=device.id
+ left join device on db.device_id=device.id
)a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -15,7 +15,7 @@
<select id="getDeviceBorrowBydeviceId" resultType="com.ruoyi.device.pojo.DeviceBorrow">
select db.*,device_name
from device_borrow db
- left join `center-lims`.device on db.device_id=device.id
+ left join device on db.device_id=device.id
where device_id=#{deviceId}
</select>
</mapper>
--
Gitblit v1.9.3