Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

amos-boot-system-equip/src/main/resources/mapper/ConfirmAlarmMapper.xml

@@ -46,6 +46,7 @@
         <choose>
         	<when test="equipId != null and equipId != ''">
         		 ala.equipment_specific_id =#{equipId}
+        		 order by ala.create_date desc limit 1
         	</when>
         	<otherwise>
         	 	ala.id =#{id} limit 1