From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java
index c50bf8e..12d9bdc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java
@@ -42,7 +42,7 @@
*/
@RequestMapping(value = "listClass", method = RequestMethod.POST)
public void listClass(AcceptData acceptData, PrintWriter out) {
- List<GoodsClass> list = goodsClassService.getEffectiveClassCache();
+ List<GoodsClass> list =goodsClassService.getEffectiveClassCache();
if (list == null ) {
list = new ArrayList<GoodsClass>();
}
--
Gitblit v1.8.0