Merge remote-tracking branch 'origin/deploy' into wjh

2025-05-30 13:39:17 +08:00 · 2025-05-30 13:39:17 +08:00 · 0bb922ddc1
commit 0bb922ddc1
parent 2faf338be2 856eea48f6
1 changed files with 1 additions and 1 deletions
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/enums/DeviceStatus.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/domain/enums/DeviceStatus.java
@ -75,7 +75,7 @@ public enum DeviceStatus {

    // 允许强制锁车的状态
    public static List<String> canQLock() {
-        return canAdminLock();
+        return CollectionUtils.map(DeviceStatus::getCode, IN_USE, Q_LOCKED);
    }

    // 不允许处理定位BUG的设备状态