From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 a200795..c27d8ef 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
@@ -25,11 +25,15 @@
List<Organization> getChildrenOrganizationsById(Integer id);
/**
- * @Description: ���������������������
- * @Param: []
+ * @Description: ������id������������
+ * @Param: [id]
* @return: com.moral.api.entity.Organization
* @Author: ���������
- * @Date: 2021/7/16
+ * @Date: 2021/9/26
*/
- Organization getStateControlStation();
+ Organization getOrganizationById(Integer id);
+
+
+
+
}
--
Gitblit v1.8.0