From 1e4e20573dfc917e7b43068da35ee532a192aacd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 15:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' 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