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

yujian

2020-05-12 eff294ec92d77f0e1cbb65702d534bbe6813c0ee

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

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

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(taoBaoOrder.getTradeId());

      commonOrder.setChildSourceType(taoBaoOrder.getOrderType());



      return commonOrder;

   }