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

gongzuming

2024-09-08 aa8652cc420f84bd3e543ebe611a563e852d4725

 src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java

@@ -34,7 +34,7 @@
    /**
     * 每天17点，定时分配订单库位（查询前一天17点到今天17点支付完成且未分配库位的订单）
     */
    @Scheduled(cron = "0 35 15 * * ?")
    @Scheduled(cron = "0 0 17 * * ?")
    public void allocatedWarehouseLocation() {
        log.info("定时分配订单库位开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
        //查询当日待分配的订单