From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/controller/OrganizationController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java
index 58fdf2c..ac56f25 100644
--- a/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -86,4 +86,12 @@
List<Organization> organizations = organizationService.getOrganizationId();
return ResultMessage.ok(ObjectUtils.isEmpty(organizations)?"0":organizations);
}
+
+
+ @GetMapping("queryDevices")
+ @ApiOperation("������������������")
+ public ResultMessage queryDevices(){
+ List<Organization> organizations = organizationService.queryDevices();
+ return ResultMessage.ok(organizations);
+ }
}
--
Gitblit v1.8.0