From b651fb598b4da4ffa734a372e8d1b0b01eeef3fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 16:10:19 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 396418a..be802b0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -1170,7 +1170,6 @@
 
 	@Override
 	public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {
-
 		return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
 	}
 

--
Gitblit v1.8.0