Merge remote-tracking branch 'origin/2.0' into 2.0

zhibing.pu

2024-08-23 1e630a0e74dab5ae9e2704de890bbb16b951ec99

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -38,6 +38,7 @@
    @Scheduled(fixedRate = 1000 * 60)
    public void taskMinute(){
        try {
            userActivityDiscount1Service.sendActivityEmail();
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -50,7 +51,6 @@
    @Scheduled(cron = "0 0 0 * * *")
    public void taskDay(){
        try {
            userActivityDiscount1Service.sendActivityEmail();
        }catch (Exception e){
            e.printStackTrace();
        }