Merge remote-tracking branch 'origin/test-merge-02' into test-merge-02

# Conflicts:
#	blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java
#	blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -229,4 +229,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 
     String getArchiveFileByParentId(@Param("nodeId") String nodeId,@Param("contractId") String contractId);
+    List<ArchivesAutoVO4> selectAllArchiveAuto(@Param("projectId")Long projectId, @Param("contractId") Long contractId, @Param("nodeIds") List<String> nodeIds,@Param("isArchive")Integer isArchive);
+
 }