From e1555cbadf7c6bd0f357f6d7bfe5b8d42404411a Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 16 十二月 2025 17:17:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java | 1 -
service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java
index 4648f66..01c7b62 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/SmartLockerApplicationServiceImpl.java
@@ -194,7 +194,6 @@
}
@Override
- @DataSource(DataSourceType.CWSJ)
public Integer selectCwByLicensePlateNumber(String licensePlateNumber) {
Integer integer = smartLockerApplicationMapper.selectCwByLicensePlateNumber(licensePlateNumber);
if (integer==null){
diff --git a/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml b/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml
index 8936aac..102cc13 100644
--- a/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/SmartLockerApplicationMapper.xml
@@ -76,7 +76,7 @@
</select>
<select id="selectCwByLicensePlateNumber" resultType="java.lang.Integer">
- SELECT `NAME` from tms_vehicle WHERE LICENSE_PLATE_NUMBER = #{licensePlateNumber} and BE_DELETE =0 order by id asc LIMIT 1
+ SELECT `car_key_no` from tms_vehicle WHERE license_plate = #{licensePlateNumber} and status =0 order by id asc LIMIT 1
</select>
<!-- 鏂板 -->
--
Gitblit v1.8.0