Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -100,10 +100,10 @@
             wl_equipment_specific_alarm_log weal
         <where>
             <if test="equipmentSpecificId != null and equipmentSpecificId != ''">
-                weal.equipment_specific_id = #{equipmentSpecificId}
+                AND weal.equipment_specific_id = #{equipmentSpecificId}
             </if>
             <if test="equipmentSpecificIndexKey != null and equipmentSpecificIndexKey != ''">
-                weal.equipment_specific_index_key = #{equipmentSpecificIndexKey}
+                AND weal.equipment_specific_index_key = #{equipmentSpecificIndexKey}
             </if>
             <if test="isConfirm != null and isConfirm != '' and isConfirm == 0">
                 AND weal.confirm_date IS NULL