From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
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