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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java

@@ -322,9 +322,9 @@
   // 每15分钟爬取一次

   @Scheduled(cron = "0 0/15 * * * ? ")

   public void pullCommonOrder() {

      LogHelper.job("正在执行15min订单爬取");

      if (!Constant.IS_TASK)

         return;

      LogHelper.job("正在执行15min订单爬取");

      long currentTime = System.currentTimeMillis() - 1000 * 60;

      String h = TimeUtil.getGernalTime(currentTime, "HH");

      String m = TimeUtil.getGernalTime(currentTime, "mm");