Merge remote-tracking branch 'origin/master'

yujian

2019-07-10 6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java

@@ -173,4 +173,9 @@
      }

   }



   @Override

   public TaoBaoOrder selectByTradeId(String tradeId) {

      return taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);

   }



}