From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +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/GoodsClassController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
index 76ad750..d3026a5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -168,7 +168,8 @@
// 杞挱鍥�
List<SwiperPicture> picList = null;
if (swpid != null) {
- picList = swiperPictureService.getByBannerId(swpid);
+ picList = swiperPictureService.getByBannerId(swpid, acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
}
if (picList == null) {
picList = new ArrayList<SwiperPicture>();
--
Gitblit v1.8.0