From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java
index 5cfda75..56005ac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java
@@ -1,22 +1,22 @@
-package com.yeshi.fanli.dao.mybatis.taobao;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.taobao.TaoBaoPunishOrder;
-
-public interface TaoBaoPunishOrderMapper extends BaseMapper<TaoBaoPunishOrder> {
-	
-	/**
-	 * 鏍规嵁浜ゆ槗ID鏌ヨ
-	 * @param tradeId
-	 * @return
-	 */
-	TaoBaoPunishOrder selectByTradeId(String tradeId);
-	
-	/**
-	 * 鏍规嵁鐖朵氦鏄揑D鏌ヨ鏁伴噺
-	 * @param orderId
-	 * @return
-	 */
-	long countByParentTradeId(String orderId);
-
+package com.yeshi.fanli.dao.mybatis.taobao;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.taobao.TaoBaoPunishOrder;
+
+public interface TaoBaoPunishOrderMapper extends BaseMapper<TaoBaoPunishOrder> {
+	
+	/**
+	 * 鏍规嵁浜ゆ槗ID鏌ヨ
+	 * @param tradeId
+	 * @return
+	 */
+	TaoBaoPunishOrder selectByTradeId(String tradeId);
+	
+	/**
+	 * 鏍规嵁鐖朵氦鏄揑D鏌ヨ鏁伴噺
+	 * @param orderId
+	 * @return
+	 */
+	long countByParentTradeId(String orderId);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0