Merge branch 'master' into div

yujian

2019-07-16 b651fb598b4da4ffa734a372e8d1b0b01eeef3fa

 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java

@@ -89,6 +89,7 @@
      commonOrder.setThirdCreateTime(new Date(order.getOrder().getOrderTime()));

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(order.getTradeId());

      commonOrder.setEstimate(order.getEstimateFee());

      return commonOrder;

   }