From 38d8abee8db1034b4cc3fae8613e8328653a1080 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 18 九月 2024 16:07:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/mapper/payment/DeliveryOrderMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/mapper/payment/DeliveryOrderMapper.java b/src/main/java/com/mzl/flower/mapper/payment/DeliveryOrderMapper.java
index 5ed5364..aacaae1 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/DeliveryOrderMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/DeliveryOrderMapper.java
@@ -38,7 +38,8 @@
     List<StationStatisticDTO> statisticStationList(@Param("startDate") LocalDateTime startDate,
                                                    @Param("endDate")LocalDateTime endDate,
                                                    @Param("name") String name,
-                                                   @Param("userId") String userId);
+                                                   @Param("userId") String userId,
+                                                   @Param("statusList") List<String> statusList);
 
     List<DeliveryOrder> selectSupplierDoEntity4Check(@Param("supplierId") Long supplierId
             , @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);

--
Gitblit v1.9.3