From 79b7711d49cee381ae0676f13a980851926a536c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 09:27:22 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index 6137af1..c0bdfd8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -449,7 +449,6 @@
 			goodsType = null;
 		}
 		
-		
 		/* 浠婃棩璁㈠崟缁熻 */
 		Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);
 

--
Gitblit v1.8.0