Merge remote-tracking branch 'origin/master'

yujian

2019-05-29 85fa0a9ed1f6cec968ca8e7ee80db872eb22c9cb

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

@@ -22,6 +22,8 @@
   
   // 通过交易ID获取订单
   TaoBaoOrder selectTaoBaoOrderByTradeId(String tradeId);
	
   List<TaoBaoOrder> listByTradeId(String tradeId);

   int updateByPrimaryKeySelective(TaoBaoOrder record);