Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/scheduler/MemberScheduler.java

@@ -43,7 +43,7 @@
    /**
     * 定时检查优惠券过期
     */
    @Scheduled(cron="0 0 * * * ?")
    @Scheduled(cron="1 0 0 * * ?")
    private void timingCheckMemberCoupon(){
        if(schedulerUtils.getSchedulerRun()) {
            log.info("定时检查优惠券过期任务开始执行");
@@ -51,7 +51,7 @@
        }
    }

    @Scheduled(cron="3 0 * * * ?")
    @Scheduled(cron="3 0 0 * * ?")
    private void timinginitIntegralFlag(){
        if(schedulerUtils.getSchedulerRun()) {
            log.info("定时更新用户每日任务标记");