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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

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