代码冲突..重新提交

src/main/java/com/msdw/tms/dao/AchievementManagementDao.java

@@ -47,7 +47,7 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
 
     AchievementManagementVO queryReport(Integer reportId);
 
-    void deleteReport(Integer reportId);
+    void deleteReport(Integer reportId,Integer recordId);
 
     IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId);
 
@@ -72,4 +72,6 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
     List<AchievementManagementVO> queryPythonTest(Integer eventId);
 
     void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment);
+
+    void deleteReportById(Integer projectId);
 }