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/service/impl/DictionaryDataServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DictionaryDataServiceImpl.java b/src/main/java/com/moral/service/impl/DictionaryDataServiceImpl.java
index 38d4d52..867a90e 100644
--- a/src/main/java/com/moral/service/impl/DictionaryDataServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DictionaryDataServiceImpl.java
@@ -18,4 +18,8 @@
query.setDictDataKey(dictDataKey);
return dataMapper.select(query);
}
+ @Override
+ public Integer querySupperOrgId() {
+ return dataMapper.selectSupperOrgId();
+ }
}
--
Gitblit v1.8.0