Merge branch 'develop' into 'master'

Develop See merge request 8timerv2/8timerapiv200!524

Merge branch 'develop' into 'master'
Develop See merge request 8timerv2/8timerapiv200!524
0a175b14 · Administrator · d80ee5a7 · 701637e8 · 0a175b14
Commit 0a175b14 authored Oct 12, 2020 by Administrator
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
@@ -98,7 +98,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组

 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 0 11 * * ?")
+//	@Scheduled(cron = "0 39 10 * * ?")
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
 	public void AttendanceTask() throws ParseException {