Merge branch 'test' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderWarehouseApproval/OrderWarehouseApprovalMapper.java

@@ -79,7 +79,7 @@ public interface OrderWarehouseApprovalMapper extends AbstractMapper<OrderWareho
             "from ecw_order_warehouse_approval a",
             "where ",
             "a.order_ids = #{orderId} ",
-            "<when test = 'types != null and types.size() > 0'>",
+            "<when test = 'typeList != null and typeList.size() > 0'>",
             "and a.type in <foreach item='type' index='index' collection='typeList' open='(' separator=',' close=')'>#{type}</foreach> ",
             "</when>",
             "<when test = 'orderItemIdList != null and orderItemIdList.size() > 0'>",