Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-27 b2cff7a3e9d5cebacef4866c5993e0be89ff5b00

 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>();