Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -76,6 +76,7 @@
 		WHERE
 		pi.point_id = #{pointId}
 		AND IF(prp.id, NOT FIND_IN_SET(pi.id,IFNULL(prp.exclude_items,'')),' 1=1 ')
+		GROUP BY pi.id
 		ORDER BY
 		    pi.order_no
     </select>