From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期五, 01 十一月 2024 13:14:08 +0800 Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4 --- 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