Merge remote-tracking branch 'origin/div' into div

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

@@ -11,5 +11,12 @@
    * @return
    */
   TaoBaoPunishOrder selectByTradeId(String tradeId);
	
   /**
    * 根据父交易ID查询数量
    * @param orderId
    * @return
    */
   long countByParentTradeId(String orderId);

}