Merge branch 'master' of http://116.63.33.55/git/dt2

spring-cloud/server-basic/src/main/resources/mapper/MonitoringResourcesMapper.xml

@@ -155,7 +155,7 @@
                 LEFT JOIN t_nodemedia_parameter tnp ON tmr.id = tnp.monitoring_resources_id
         <where>
             <if test="monitoringPointName != null and monitoringPointName != ''">
-                and monitoring_point_name = #{monitoringPointName}
+                and monitoring_point_name LIKE CONCAT('%', #{monitoringPointName},'%')
             </if>
         </where>
         ORDER BY