From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/OrganizationService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java b/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
index 91066ff..4ae7d94 100644
--- a/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
import com.moral.api.pojo.form.organization.*;
/**
@@ -53,14 +53,15 @@
OrganizationQueryDTO queryOrganization(OrganizationQueryForm organizationQueryForm);
+
/**
- * @Description: ���������������������������Id������������
- * @Param: [organizationQueryNameForm]
- * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO
+ * @Description: ������������������������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO
* @Author: ���������
- * @Date: 2021/4/13
+ * @Date: 2021/5/6
*/
- OrganizationQueryNameDTO queryOrganizationNames(OrganizationQueryNameForm organizationQueryNameForm);
+ OrganizationQueryNamesDTO queryNames(OrganizationQueryNamesForm form);
}
--
Gitblit v1.8.0