Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderItem/OrderItemMapper.java

@@ -239,8 +239,8 @@ public interface OrderItemMapper extends AbstractMapper<OrderItemDO> {
             "where  oi.deleted = 0 and ",
             "oi.warehouse_in_info is not null and warehouse_in_info ->> '$.cartonsNum' > 0 ",
             "and oi.order_id in ",
-            "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>#{item}</foreach>",
+            "<foreach item='item' index='index' collection='orderIdList' open='(' separator=',' close=')'>#{item}</foreach>",
             "</script>"
     })
-    List<OrderItemDO> getWarehouseInOrderItemListByOrderIds(@Param("lang") Integer lang, List<Long> orderIdList);
+    List<OrderItemDO> getWarehouseInOrderItemListByOrderIds(@Param("lang") Integer lang, @Param("orderIdList") List<Long> orderIdList);
 }