Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/resources/mapper/MonitorPointMapper.xml

@@ -229,4 +229,15 @@
    <select id="getMonitorName" resultType="java.lang.String">
        select name from monitor_point where id=#{mpId}
    </select>

    <select id="getMonitorPointsByOrganizationIds" resultMap="BaseResultMap">
        SELECT
        *
        FROM monitor_point m
        WHERE m.`organization_id`
        IN
        <foreach collection="orgIds" item="orgId" close=")" open="(" separator=",">
            #{orgId}
        </foreach>
    </select>
</mapper>