代码冲突

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -4,6 +4,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springblade.business.dto.EKeyDto;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
+import org.springblade.manager.dto.MoveNodeDTO;
 import org.springblade.manager.dto.RangeInfo;
 import org.springblade.manager.dto.WbsTreeContractDTO;
 import org.springblade.manager.dto.WbsTreeContractDTO2;
@@ -101,7 +102,7 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
 
     R importPartitionCode(MultipartFile file);
 
-    R getIsImport(Long projectId, Long contractId);
+    Boolean getIsImport(Long projectId, Long contractId);
 
     R getImportProgress(Long projectId, Long contractId);