Merge remote-tracking branch 'origin/div' into div

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

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