Merge branch 'div1'

yujian

2019-01-05 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24

 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);
	
	
}