Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 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();
}