From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期五, 21 三月 2025 10:57:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java b/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java index dc6aac4..1323042 100644 --- a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java +++ b/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java @@ -6,7 +6,7 @@ import com.ycl.common.group.Update; import com.ycl.domain.form.ProjectPlanProgressReportForm; import com.ycl.domain.query.ProjectPlanProgressReportQuery; -import com.ycl.domain.vo.ProgressReportResponseVO; +import com.ycl.domain.form.ProgressReportResponseForm; import com.ycl.service.ProjectPlanProgressReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,12 +36,12 @@ @PostMapping @ApiOperation(value = "娣诲姞", notes = "娣诲姞") // @PreAuthorize("hasAuthority('projectPlanProgressReport:add')") - public Result add(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) { + public Result add(@RequestBody @Validated(Add.class) ProgressReportResponseForm form) { return projectPlanProgressReportService.add(form); } @PostMapping("/examine") - public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) { + public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseForm form) { return projectPlanProgressReportService.examine(form); } @@ -76,7 +76,7 @@ @GetMapping("/{id}") @ApiOperation(value = "璇︽儏", notes = "璇︽儏") // @PreAuthorize("hasAuthority('projectPlanProgressReport:detail')") - public Result detail(@PathVariable("id") Integer id) { + public Result detail(@PathVariable("id") Long id) { return projectPlanProgressReportService.detail(id); } -- Gitblit v1.8.0