Merge branch 'dev_zj' into dev

zss

2025-03-06 218c85f5128b95cedcc20127c60d1915bb1f7bc6

 cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java

@@ -229,7 +229,7 @@
     * @return
     */
    @ApiOperation(value = "人员培训详情附件删除")
    @GetMapping("/delTrainingDetailedFileList")
    @DeleteMapping("/delTrainingDetailedFileList")
    public Result delTrainingDetailedFileList(Integer detailedFileId){
        return Result.success(personTrainingDetailedFileMapper.deleteById(detailedFileId));
    }