Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

 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;

   }