From 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 17:51:32 +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/h5/H5StrategyPictureController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
index 3109545..928f464 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
@@ -63,7 +63,7 @@
@RequestMapping(value = "getStrategyPictureList")
public void strategyPicture(String callback, AcceptData acceptData, PrintWriter out) {
- List<StrategyPicture> list = strategtPictureService.getStrategyPictureListCache();
+ List<StrategyPicture> list = strategtPictureService.getTextStrategyPictureListCache();
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
if (StringUtil.isNullOrEmpty(callback)) {
List<StrategyPicture> newList = new ArrayList<StrategyPicture>();
--
Gitblit v1.8.0