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

src/main/resources/mapper/DoorDeviceInfoMapper.xml

@@ -39,10 +39,10 @@
             and ddi.device_address = #{entity.deviceAddress}
         </if>
         <if test="entity.dataType !=null and entity.dataType != '' ">
-            and ddi.data_type = #{entity.dataType}
+            and drd.data_type = #{entity.dataType}
         </if>
         <if test="entity.abnormal !=null and entity.abnormal != '' ">
-            and ddi.abnormal = #{entity.abnormal}
+            and drd.abnormal = #{entity.abnormal}
         </if>
         <if test="entity.px == '1'.toString() "><!-- 排序-->
             order BY ddi.create_date desc
@@ -68,4 +68,4 @@
         where business_id = #{entity.businessId}
     </update>
 
-</mapper>
\ No newline at end of file
+</mapper>