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 |   69 +++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 31 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 a5d89ee..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,10 +4,8 @@
 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.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationQueryForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
+import com.moral.api.pojo.form.organization.*;
 
 /**
  * <p>
@@ -15,46 +13,55 @@
  * </p>
  *
  * @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
  */
 public interface OrganizationService extends IService<Organization> {
-
-    /** 
-    * @Description: ������������������
-            * @Param: [organizationInsertForm]
-            * @return: void
-            * @Author: ���������
-            * @Date: 2021/3/22
-            */
+    /**
+     * @Description: ������������������
+     * @Param: [organizationInsertForm]
+     * @return: void
+     * @Author: ���������
+     * @Date: 2021/3/22
+     */
     OrganizationDTO insertOrganization(OrganizationInsertForm organizationInsertForm);
 
     /**
-    * @Description: ������������������
-            * @Param: [organizationUpdateForm]
-            * @return: com.moral.api.pojo.dto.organization.OrganizationDTO
-            * @Author: ���������
-            * @Date: 2021/3/24
-            */
+     * @Description: ������������������
+     * @Param: [organizationUpdateForm]
+     * @return: com.moral.api.pojo.dto.organization.OrganizationDTO
+     * @Author: ���������
+     * @Date: 2021/3/24
+     */
     OrganizationDTO updateOrganization(OrganizationUpdateForm organizationUpdateForm);
 
     /**
-    * @Description: ������������������
-            * @Param: [organizationDeleteForm]
-            * @return: com.moral.api.pojo.dto.organization.OrganizationDTO
-            * @Author: ���������
-            * @Date: 2021/3/25
-            */
+     * @Description: ������������������
+     * @Param: [organizationDeleteForm]
+     * @return: com.moral.api.pojo.dto.organization.OrganizationDTO
+     * @Author: ���������
+     * @Date: 2021/3/25
+     */
     OrganizationDTO deleteOrganization(OrganizationDeleteForm organizationDeleteForm);
 
     /**
-    * @Description: ������������������
-            * @Param: [organizationQueryForm]
-            * @return: com.moral.api.pojo.dto.organization.OrganizationQueryDTO
-            * @Author: ���������
-            * @Date: 2021/3/25
-            */
+     * @Description: ������������������������
+     * @Param: [organizationQueryForm]
+     * @return: com.moral.api.pojo.dto.organization.OrganizationQueryDTO
+     * @Author: ���������
+     * @Date: 2021/3/25
+     */
     OrganizationQueryDTO queryOrganization(OrganizationQueryForm organizationQueryForm);
 
 
 
+    /**
+    * @Description: ������������������������
+            * @Param: [form]
+            * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO
+            * @Author: ���������
+            * @Date: 2021/5/6
+            */
+     OrganizationQueryNamesDTO queryNames(OrganizationQueryNamesForm form);
+
+
 }

--
Gitblit v1.8.0