Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -375,5 +375,17 @@
   public List<CommonOrderVO> searchOrderByUid(AcceptData acceptData, int page, int size, Long uid, List<ESOrder> list) throws Exception;

   public long countSearchOrderByUid(Long uid, List<ESOrder> list);
	
   /**
    * 返回订单的第三方创建时间
    * @Title: getThirdCreateTime
    * @Description: 
    * @param orderId
    * @param sourceType
    * @return 
    * Date 返回类型
    * @throws
    */
   public Date getThirdCreateTime(String orderId,int sourceType);

}