From f3e5745f67d885352691100336aacad8b064cd64 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 17 四月 2019 16:00:59 +0800
Subject: [PATCH] Merge branch 'div'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
index 6e7b560..250a147 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
@@ -239,5 +239,4 @@
 		return countOrderNumberBySettleTime(uid, 2, 4); // 鏍规嵁
 	}
 	
-	
 }

--
Gitblit v1.8.0