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

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

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