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

admin

2019-08-23 f00114371d8d379da18bc7fed3541b2575edea56

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -487,6 +487,7 @@
         return;

      }



      try {

      List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE,

            Constant.PAGE_SIZE);

      if (list == null) {

@@ -500,6 +501,10 @@
      data.put("list", getGson().toJson(list));

      data.put("helpLink", configService.get("publish_list_help_link"));

      out.print(JsonUtil.loadTrueResult(data));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "获取失败"));

         return;

      }

   }



   /**