Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 67443feab8afa7171b31b8ccac94440e52b98f98

 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;

   }