Merge branch 'feature' into 'release'

简报发布任务调整3

See merge request !234

src/main/java/com/zhiwei/brandkbs2/service/impl/ReportServiceImpl.java

@@ -247,7 +247,7 @@ public class ReportServiceImpl implements ReportService {
         try {
             result = getPcReportResult(report);
         } catch (Exception e) {
-            log.error("生成报告数据异常", e);
+            log.error("生成报告数据异常,id:{}", report.getId(), e);
             ExceptionCast.cast(CommonCodeEnum.FAIL, "生成报告数据异常");
         }
         redisUtil.set(redisKey, JSON.toJSONString(result));