Skip to content

A
amos-boot-biz
Commit e6255251 authored by maoying's avatar maoying
Browse files
Options

Merge branch 'developer' into temp

parents 5eeeda50 a96d5fcd
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ e6255251
......@@ -285,6 +285,7 @@
<if test="alarmType == 'FIREALARM'">AND d.type = #{alarmType}</if>
</where>
</select>
<select id="pageAlarmsInfo" resultType="Map">
SELECT
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