Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/service/DictionaryDataService.java

@@ -6,4 +6,6 @@

public interface DictionaryDataService {
    List<DictionaryData> queryByKey(String dictDataKey);

    Integer querySupperOrgId();
}