Merge remote-tracking branch 'origin/dev2' into dev2

RMS/src/main/java/cn/cslg/report/service/impl/FollowUpServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

RMS/src/main/resources/mapper/FollowUpMapper.xml

@@ -126,7 +126,7 @@
     </delete>
 
     <!--根据后续事项id和文件id删除数据-->
-    <!--int deleteAssoId(Integer followUpId, Integer fileId);-->
+    <!--int deleteAssoId(Integer followUpId, List<Integer> fileIds);-->
     <delete id="deleteAssoId">
         delete
         from asso_follow_up_file