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

admin

2020-01-03 1e4e20573dfc917e7b43068da35ee532a192aacd

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

@@ -540,7 +540,7 @@
      }



      try {

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

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

               Constant.PAGE_SIZE);

         if (list == null) {

            list = new ArrayList<CodePublishRecord>();