Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -69,11 +69,11 @@ public class SyncHeartTask implements SchedulingConfigurer {
             }
             try {
                 if (curTime1 - lastTime1 > timeInterval1) {
-                    heartService.uploadAllBus(null);
-                    heartService.uploadAllUserData(null);
+//                    heartService.uploadAllBus(null);
+//                    heartService.uploadAllUserData(null);
                     //                heartService.uploadScheduleList();
-                    heartService.uploadThrData(null);
-                    heartService.uploadThrProducts(null);
+//                    heartService.uploadThrData(null);
+//                    heartService.uploadThrProducts(null);
                     heartService.uploadSysSetting(null);
                     Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
                         heartService.pushData(syncDataSetEntity, null, i);