Merge remote-tracking branch 'origin/main'

common/src/main/java/com/sdm/common/entity/req/data/QueryDirReq.java

@@ -47,4 +47,10 @@ public class QueryDirReq extends BaseReq {
     @Schema(description = "项目id")
     String projectId;
 
+    /**
+     * 文件夹id
+     */
+    @Schema(description = "文件夹id")
+    private Long dirId;
+
 }

common/src/main/java/com/sdm/common/entity/req/task/TaskExportExcelParam.java

@@ -54,4 +54,6 @@ public class TaskExportExcelParam {
      * 需求id
      */
     private String demandId;
+
+    private List<String> filterDiscipline;
 }

common/src/main/java/com/sdm/common/entity/req/task/TaskTreeExportExcelParam.java

@@ -34,4 +34,6 @@ public class TaskTreeExportExcelParam {
      */
     private Integer endIndex;
 
+    private List<String> filterDiscipline;
+
 }