Merge branch 'dev' into test

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/approval/OrderApprovalMapper.java

@@ -211,7 +211,7 @@ public interface OrderApprovalMapper extends AbstractMapper<OrderApprovalDO> {
             "where ",
             "a.order_id = #{orderId} ",
             "<when test = 'types != null and types.size() > 0'>",
-            "and a.type in <foreach item='type' index='index' collection='typeList' open='(' separator=',' close=')'>#{type}</foreach> ",
+            "and a.type in <foreach item='type' index='index' collection='types' open='(' separator=',' close=')'>#{type}</foreach> ",
             "</when>",
             "<when test = 'orderItemIdList != null and orderItemIdList.size() > 0'>",
             "and (a.details->>'$.orderItemId' is null or (a.details->>'$.orderItemId' is not null and a.details->>'$.orderItemId' in <foreach item='orderItemId' index='index' collection='orderItemIdList' open='(' separator=',' close=')'>#{orderItemId}</foreach>)) ",