Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/resources/mapper/AlarmConfigMapper.xml

@@ -114,4 +114,13 @@
    where dev.mac = #{mac,jdbcType=VARCHAR}
    limit 0,1
  </select>
    <select id="getValueByOrganizationId" resultType="java.lang.String">
      select `value`
      from alarm_config
      where organization_id = #{organizationId,jdbcType=INTEGER}
      limit 0,1
    </select>
  <select id="containOrgId" resultType="java.lang.Integer">
    select COUNT(*) from  alarm_config where id=#{orgId}
  </select>
</mapper>