Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

 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);