From 53a8a9426f21c7f853c406e462486029c78018b2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 03 八月 2024 09:33:08 +0800
Subject: [PATCH] 电磁锁临时电子围栏加入主动操控失效提交
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index 2b7d10e..ba8493e 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -218,7 +218,8 @@
@GetMapping("/getDeptAndCameraWithCheckBox")
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
public AjaxResult getDeptAndCameraWithCheckBox() {
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+ //Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+ List<Map<String, Object>> deptAndCamera = ardCamerasService.getChildDeptAndCameraOwn(false);
return AjaxResult.success(deptAndCamera);
}
--
Gitblit v1.9.3