Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis-background

# Conflicts:
#	gyee-sample-impala/src/main/java/com/gyee/impala/common/spring/InitialRunner.java

gyee-sample-impala/src/main/java/com/gyee/impala/common/spring/InitialRunner.java

@@ -146,7 +146,7 @@ public class InitialRunner implements CommandLineRunner {
     public void cacheHistory(){
         historyModelMap.clear();
         historyList.clear();
-        List<Diagnosetrainhistory> historyList = diagnosetrainhistoryService.getListAll();
-        historyModelMap = historyList.stream().filter(a -> a.isEnable()).collect(Collectors.groupingBy(Diagnosetrainhistory::getModel));
+        historyList = diagnosetrainhistoryService.getListAll();
+        historyModelMap = historyList.stream().collect(Collectors.groupingBy(Diagnosetrainhistory::getModel));
     }
 }