Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

 cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java

@@ -66,10 +66,8 @@
     */

    @ApiOperation(value = "查询内审管理纠正措施列表")
    @PostMapping("/pageInternalCorrect")
    public Result<IPage<InternalCorrect>> pageInternalCorrect(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        InternalCorrect detailsCorrect = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalCorrect.class);
    @GetMapping("/pageInternalCorrect")
    public Result<IPage<InternalCorrect>> pageInternalCorrect(Page page, InternalCorrect detailsCorrect) {
        return Result.success(internalCorrectService.pageInternalCorrect(page, detailsCorrect));
    }

@@ -104,7 +102,7 @@
     */

    @ApiOperation(value = "删除内审管理纠正措施附件")
    @GetMapping("/delInternalCorrectFile")
    @DeleteMapping("/delInternalCorrectFile")
    public Result delInternalCorrectFile(Integer correctFileId){
        return Result.success(internalCorrectFileMapper.deleteById(correctFileId));
    }