Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java

@@ -6,6 +6,7 @@
import com.ruoyi.personnel.dto.PersonTrainingDto;
import com.ruoyi.personnel.pojo.PersonTraining;
import com.ruoyi.personnel.pojo.PersonTrainingDetailed;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
@@ -22,7 +23,7 @@
public interface PersonTrainingService extends IService<PersonTraining> {

    IPage<PersonTrainingDto> personTrainingSelect(Page page,
                                                  String compilerName, String departmentId);
                                                  @Param("compilerName") String compilerName, @Param("departmentId") String departmentId);

    void personTrainingImport(MultipartFile file, PersonTraining training);