Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -1937,14 +1937,14 @@
         LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3
         <where>
             and packet_bar_status != 2
-            <if test="reservationId !=null ">
+            <if test="reservationIds !=null ">
                 and ldrp.reservation_id in
                 <foreach collection="reservationIds" item="reservationId" open="(" separator="," close=")">
                     #{reservationId}
                 </foreach>
             </if>
 
-            <if test="warehourseId !=null and warehourseId!= ''">
+            <if test="warehouseId !=null and warehouseId!= ''">
                 and ldpl.warehouse_id=#{warehourseId}
             </if>
         </where>