Merge branch 'developer' into 'master'

刷新次数以及主门店变更刷新企业微信好友

See merge request !128

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -469,8 +469,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         syncCheckDTO.setSyncStatus(syncTask.getStatusFlag());
 
         PreDealLogInfoDTO dealLogInfoDTO = preDealService.getLastPreDataByTaskId(taskId);
-        //一分钟内没执行就重试 并在一天内
-        Date date = DateUtils.addMinutes(new Date(), -1);
+        //30分钟内没执行就重试 并在一天内
+        Date date = DateUtils.addMinutes(new Date(), -30);
         Date dayDate = DateUtils.addDays(new Date(), -1);
         if (dealLogInfoDTO.getUpdateTime().before(date)
                 &&syncTask.getUpdateTime().before(date)