From 4b6440a58c6402eacb09e9eba67f988bd65000a4 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 19 十月 2023 10:12:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java index cf986df..146f406 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java +++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java @@ -22,7 +22,8 @@ int delCar(String id); - List<CarLockVo> carLock(String carId); + CarVo carOne(String carId); + List<ArdSyCarLock> carLock(String rtu); int addUpdLock(List<ArdSyCarLock> ardSyCarLock); -- Gitblit v1.9.3