Merge remote-tracking branch 'remotes/origin/master' into zhuly_bate

src/main/java/com/founder/interservice/controller/GetTrackTest.java

@@ -21,7 +21,7 @@ public class GetTrackTest {
     @Autowired
     private IphoneTrackService iphoneTrackService;
 
-    @Scheduled(initialDelay = 1000,fixedDelay = 14400000) //项目启动后延迟两分钟执行，每次执行完后两分钟后再次执行
+    //@Scheduled(initialDelay = 1000,fixedDelay = 14400000) //项目启动后延迟两分钟执行，每次执行完后两分钟后再次执行
     public void getTrackInfo(){
         System.out.println("============ data get Thread start Running =============");
         List<String> imsis = new ArrayList<String>();