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

# Conflicts:
#	.idea/workspace.xml

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -994,7 +994,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
 
     /**
      * 重新跟踪
-     *
      * @param reportEntity
      * @return
      */

src/main/java/com/ejweb/modules/report/utils/TimedTask.java

+package com.ejweb.modules.report.utils;
+
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+/**
+ * Created by haoqm on 2019/7/18.
+ */
+@Service
+@Lazy(false)
+public class TimedTask {
+
+    @Scheduled(cron="0 0 0 * * ?")   //每天晚上12点执行
+    public void job1() {
+        System.out.println("spring task 注解使用。。。任务进行中(每天下午6点触发)");
+        //获取所有转为线索的举报信息
+
+
+    }
+}