Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

 src/main/java/com/moral/mapper/DictionaryDataMapper.java

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

public interface DictionaryDataMapper extends BaseMapper<DictionaryData> {
    public  Integer selectSupperOrgId();
    public  boolean isSupperOrgId(Integer orgId);
    String getDefultAlarm();
}