From debb3a579f798d71072f037f74e3e6b43b5fe0ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 四月 2019 10:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
index 2be2870..a6eb4b4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
@@ -62,5 +62,4 @@
 	 */
 	public Map<String, Object> lastMonthSettleOrderNumber(Long uid);
 
-
 }

--
Gitblit v1.8.0