From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/DictionaryDataMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DictionaryDataMapper.java b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
index 038a4be..0bb1798 100644
--- a/src/main/java/com/moral/mapper/DictionaryDataMapper.java
+++ b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
@@ -2,7 +2,8 @@
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.DictionaryData;
+import org.apache.ibatis.annotations.Param;
 
 public interface DictionaryDataMapper extends BaseMapper<DictionaryData> {
-//    DictionaryData selectByPrimaryKey(Integer id);
+    public  Integer selectSupperOrgId();
 }
\ No newline at end of file

--
Gitblit v1.8.0