Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!524

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

@@ -98,7 +98,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组
 	//typeid:1-员工  2-考勤组
 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@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点 执行
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
 	public void AttendanceTask() throws ParseException {
 	public void AttendanceTask() throws ParseException {