From 5eb88939c094fac1f5dc9201b5af6da4165cc185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 9 +++++----
1 files changed, 5 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..c7f33b8 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,12 @@
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