From f9414a92c54c9c158dc557cb6dcba6736279c457 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 五月 2019 11:33:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java
index 02e018d..b1e6469 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java
@@ -129,10 +129,12 @@
 
 		if (page == null || page < 1) {
 			out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
+			return;
 		}
 
 		if (uid == null) {
 			out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+			return;
 		}
 
 		try {

--
Gitblit v1.8.0