From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/OrganizationRelationMapper.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/mapper/OrganizationRelationMapper.java b/src/main/java/com/moral/mapper/OrganizationRelationMapper.java
index 250907b..801d2f1 100644
--- a/src/main/java/com/moral/mapper/OrganizationRelationMapper.java
+++ b/src/main/java/com/moral/mapper/OrganizationRelationMapper.java
@@ -1,10 +1,16 @@
package com.moral.mapper;
-import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Param;
+
+
+import com.moral.common.mapper.BaseMapper;
import com.moral.entity.OrganizationRelation;
-import com.moral.entity.OrganizationRelationExample;
-@Mapper
-public interface OrganizationRelationMapper extends BaseMapper<OrganizationRelation, OrganizationRelationExample, Integer> {
+public interface OrganizationRelationMapper extends BaseMapper<OrganizationRelation> {
+
+ List<Map<String, Object>> getChildIdByParentId(@Param("parentIdList") List<Object> parentIdList);
+
}
\ No newline at end of file
--
Gitblit v1.8.0