Merge remote-tracking branch 'origin/master' into prod_test

# Conflicts:
#	src/main/java/cn/cslg/pas/common/dto/business/UpdateReportProjectDTO.java

src/main/java/cn/cslg/pas/common/dto/business/UpdateReportProjectDTO.java

@@ -60,7 +60,7 @@ public class UpdateReportProjectDTO {
     @Schema(description = "结论论述")
     private String cronDescription;
     @Schema(description = "事件集合")
-    List<ProjectEventDTO>  events;
+    List<ProjectEventDTO> events;
     @Schema(description = "文件guids")
     private List<String> fileGuids;
     @Schema(description = "核心结论")
@@ -84,6 +84,7 @@ public class UpdateReportProjectDTO {
     private String caseStage;
     @Schema(description = "参与人id")
     private List<String> involvedPersonIds;
+    private Integer actType;
     @Schema(description = "主被动类型")
     private Integer actType;
 }