Skip to content

A
amos-boot-biz
Commit 0b12ab9b authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'develop_dl' of http://36.40.66.175:5000//moa/amos-boot-biz into develop_dl

parents 148c442d 129f6327
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @ 0b12ab9b
...@@ -2672,7 +2672,7 @@ ...@@ -2672,7 +2672,7 @@
</if> </if>
AND wed.equipment_name is not null AND wed.equipment_name is not null
</where> </where>
ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC , wes.create_date DESC
</select> </select>
<select id="getMonitoringCount" resultType="java.util.Map"> <select id="getMonitoringCount" resultType="java.util.Map">
SELECT SELECT
......
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