Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 be7a263801a25b2f2bdff574689042abcc8f0a8c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java

@@ -27,7 +27,9 @@
    * @param status 售后状态
    * @return
    */
   List<OrderRefundPassList> getOrderRefundPassList(PageInfo<OrderRefundPassList> pageInfo, @Param("orderNumber") String orderNumber, @Param("appUserIds") List<Long> appUserIds,
   List<OrderRefundPassList> getOrderRefundPassList(PageInfo<OrderRefundPassList> pageInfo,
                                        @Param("orderNumber") String orderNumber,
                                        @Param("appUserIds") List<Long> appUserIds,
                                                    @Param("shopId") Integer shopId, @Param("refundMethod") Integer refundMethod,
                                                    @Param("status") Integer status);