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

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -254,9 +254,9 @@
         c.binding_time
         from device d
         inner join device_type dt on d.device_type = dt.id
-        inner join app_device_bind_record c on d.id = c.device_id
+        inner join app_device_bind_record c on d.id = c.device_id and c.communication_mode = 0
         left join app_personnel_info ap on ap.device_id = d.id
-        where dt.communication_mode = 0
+        where dt.communication_mode in (0, 2)
         <if test="criteria.deviceType != null">
             and d.device_type = #{criteria.deviceType}
         </if>