From 20439bc0fa1ff714ed5f61e711272deebb76e2c9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 17 八月 2023 16:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 a7ca092..e0efc82 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
@@ -148,14 +148,14 @@
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�")
public AjaxResult getDeptAndCamera()
{
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
return AjaxResult.success(deptAndCamera);
}
@GetMapping("/getDeptAndCameraWithCheckBox")
@ApiOperation("鑾峰彇閮ㄩ棬鍜岀浉鏈�(寮�鍚閫夋)")
public AjaxResult getDeptAndCameraWithCheckBox()
{
- Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
+ Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
return AjaxResult.success(deptAndCamera);
}
@PostMapping("/getNearCamerasBycoordinate")
--
Gitblit v1.9.3