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

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

@@ -354,7 +354,7 @@
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')
             </if>
             <if test="param.alarmLogId != null">
-                and wlesal.id = #{alarmLogId}
+                and wlesal.id = #{param.alarmLogId}
             </if>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
                 and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")