From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
index af3ce6b..658f2e2 100644
--- a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
@@ -127,12 +127,13 @@
     {
         return radarClient.guideInfoBack(guideInfo);
     }
-
+    /**
+     * 鑾峰彇閮ㄩ棬鍜岄浄杈�
+     */
     @GetMapping("/getDeptAndRadar")
     @ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�")
     public AjaxResult getDeptAndCamera() {
         Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
         return AjaxResult.success(deptAndCamera);
     }
-
 }

--
Gitblit v1.9.3