Merge remote-tracking branch 'origin/master' into mssw

msss-gis/src/main/resources/mapper/custom/CustomDisplayMapper.xml

@@ -2427,6 +2427,9 @@
         <if test="dto.type != null and dto.type.trim() != ''">
             AND c.TYPE = #{dto.type}
         </if>
+        <if test="dto.deviceType != null and dto.deviceType.trim() != ''">
+            AND c.device_type = #{dto.deviceType}
+        </if>
         <if test="dto.deviceId != null and dto.deviceId.size()>0 ">
             AND c.id in
             <foreach collection="dto.deviceId" item="index" open="(" close=")" separator=",">
@@ -2525,6 +2528,9 @@
         <if test="dto.type != null and dto.type.trim() != ''">
             AND c.TYPE = #{dto.type}
         </if>
+        <if test="dto.deviceType != null and dto.deviceType.trim() != ''">
+            AND c.device_type = #{dto.deviceType}
+        </if>
         <if test="dto.deviceId != null and dto.deviceId.size()>0 ">
             AND c.id in
             <foreach collection="dto.deviceId" item="index" open="(" close=")" separator=",">
@@ -2622,6 +2628,9 @@
         <if test="dto.type != null and dto.type.trim() != ''">
             AND c.TYPE = #{dto.type}
         </if>
+        <if test="dto.deviceType != null and dto.deviceType.trim() != ''">
+            AND c.device_type = #{dto.deviceType}
+        </if>
         <if test="dto.deviceId != null and dto.deviceId.size()>0 ">
             AND c.id in
             <foreach collection="dto.deviceId" item="index" open="(" close=")" separator=",">