Merge branch 'div'

yujian

2019-04-12 133bbaabbf17f5a0a478549a50f7fb89b883fef9

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -736,6 +736,7 @@
      commonOrder.setThirdCreateTime(

            new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(taoBaoOrder.getTradeId());



      return commonOrder;