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/service/OrganizationService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
index d55d9b4..5f78975 100644
--- a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
@@ -2,6 +2,7 @@
import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -33,13 +34,22 @@
*/
Organization getOrganizationById(Integer id);
+
/**
- * ������������������������
+ * ������������������������
+ * @param organizationId
* @return
*/
-
- List<Organization> getOrganizations();
+ List<Integer> orgIdList( Integer organizationId);
+ /**
+ * ������������������������������
+ * @param
+ * @return
+ */
+ List<Organization> getOrganizationId();
+
+ List<Organization> queryDevices();
}
--
Gitblit v1.8.0