拉去考勤

src/main/java/com/template/controller/ScheduleController.java

@@ -83,11 +83,7 @@ public class ScheduleController {
     //周一到周五早上七点执行：0 0 7 ? * MON-FRI
     //0 0 22 * * ?
     @Async
-<<<<<<< HEAD
     @Scheduled(cron = "0 0 */1 * * ?")//一个小时
-=======
-    @Scheduled(cron = "0 0 22 * * ? ")
->>>>>>> 8d5e6bb48a5afee8d07dfb01b54d055046e7921c
     @Transactional(rollbackFor = {Exception.class})
     public void autoDispatch() throws Exception {