Merge branch 'dev' into pre-production

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -200,7 +200,7 @@
     <select id="findAllAbnormalTrayList" resultType="Long">
         select tray_id
         from repair_tray_updown_data
-        and deal_status = 0
+        where deal_status = 0
     </select>
 
     <select id="findOldTrayId" resultType="int">
@@ -230,7 +230,7 @@
     </delete>
 
     <update id="updateUpdownTypeIsDeleted">
-        update from logpm_warehouse_updown_type
+        update logpm_warehouse_updown_type
         set is_deleted = 1
         where  allocation_id = #{oldAllocationId}
         and is_deleted = 0