Skip to content

A
amos-boot-biz
Commit f016e2ca authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents e7db691b a4a79c73
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml
View file @ f016e2ca
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
and a.stationtype = #{stationType} and a.stationtype = #{stationType}
</if> </if>
<if test="warningName != '' and warningName != null"> <if test="warningName != '' and warningName != null">
and a.warning_name = #{warningName} and a.warningname = #{warningName}
</if> </if>
<if test="stationId != '' and stationId != null"> <if test="stationId != '' and stationId != null">
and a.gateway_id = #{stationId} and a.gateway_id = #{stationId}
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
and a.stationType = #{stationType} and a.stationType = #{stationType}
</if> </if>
<if test="warningName != '' and warningName != null"> <if test="warningName != '' and warningName != null">
and a.warning_name = #{warningName} and a.warningname = #{warningName}
</if> </if>
<if test="stationId != '' and stationId != null"> <if test="stationId != '' and stationId != null">
and a.gateway_id = #{stationId} and a.gateway_id = #{stationId}
......
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