Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/resources/mapper/DictionaryDataMapper.xml

@@ -24,4 +24,8 @@
    select count(*) from dictionary_data
    where dict_data_key = 'auth_config_super_org' and dict_data_value = #{orgId,jdbcType=INTEGER}
  </select>
  <select id="getDefultAlarm" resultType="java.lang.String">
      select dict_data_value from dictionary_data
    where dict_data_key = 'default_alarm_config_value'
  </select>
</mapper>