Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

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

@@ -66,7 +66,7 @@
    @Autowired
    private CouponRecordService couponRecordService;

    @Scheduled(cron = "1 0/20 * * * ?")
    @Scheduled(cron = "1 0/30 * * * ?")
    public void calculateAvePrice() {
        log.info("均价计算开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
        List<FlowerCategory> cLs = categoryMapper.selectList(new QueryWrapper<FlowerCategory>()