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

admin

2020-05-16 554d3857358b0ea53c4f65d8d9baad113ef1deb4

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