Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java

@@ -54,5 +54,14 @@
    * @param realtionId

    */

   public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId);

	
	
	
   /**

    * 根据交易ID获取订单号

    * @param tradeId

    * @return

    */

   public TaoBaoOrder selectByTradeId(String tradeId);



}