Skip to content

A
amos-boot-biz
Commit 24ba1713 authored by 高建强's avatar 高建强
Browse files
Options

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

parents 647894ad 3a9a015e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 24ba1713
...@@ -5254,8 +5254,6 @@ ...@@ -5254,8 +5254,6 @@
FROM FROM
`wl_equipment_specific_alarm_log` `wl_equipment_specific_alarm_log`
WHERE WHERE
`wl_equipment_specific_alarm_log`.`status` = 1
AND
0 <![CDATA[<>]]> find_in_set(`fs`.`id`, `wl_equipment_specific_alarm_log`.`system_ids`) 0 <![CDATA[<>]]> find_in_set(`fs`.`id`, `wl_equipment_specific_alarm_log`.`system_ids`)
<if test="startDate!=null"> <if test="startDate!=null">
AND DATE_FORMAT(`wl_equipment_specific_alarm_log`.update_date,'%y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(#{startDate},'%y-%m-%d') AND DATE_FORMAT(`wl_equipment_specific_alarm_log`.update_date,'%y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(#{startDate},'%y-%m-%d')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment