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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java

@@ -132,7 +132,7 @@
      for (int i = 0; i < 24; i++) {

         Date da = new Date(startTime.getTime() + 1000 * 60 * 60L * i);

         if (da.getTime() > now.getTime())

            return;

            break;

         List<JDOrder> tempOrderList = getHourOrder(da);

         if (tempOrderList != null && tempOrderList.size() > 0)

            orderList.addAll(tempOrderList);