Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java

@@ -68,4 +68,7 @@
   List<TaoBaoOrder> getStateByOrderIdAndPayment(@Param("orderId")String orderId, @Param("payment")String payment);
   
   
   TaoBaoOrder selectLatestByAuctionId(long auctionId);
	
	
}