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

src/main/java/com/galaxis/manatee/task/LogCheckTask.java

@@ -33,7 +33,7 @@ public class LogCheckTask {
      * 2.遍历每个用户，核对每周、每月工时准确性
      * 3.遍历每个项目核对每个项目总工时
      */
-    @Scheduled(fixedDelay = 432000000L)
+//    @Scheduled(fixedDelay = 432000000L)
     private void checkLod(){
         chuanyunUserCompanyDao.findAll().forEach(chuanyunUserCompanyDO -> {
             long start=System.currentTimeMillis();