From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 14 三月 2025 11:43:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/controller/ProgressPlanController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProgressPlanController.java b/business/src/main/java/com/ycl/controller/ProgressPlanController.java
index 6c2e2c0..2708f83 100644
--- a/business/src/main/java/com/ycl/controller/ProgressPlanController.java
+++ b/business/src/main/java/com/ycl/controller/ProgressPlanController.java
@@ -6,7 +6,7 @@
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProgressPlanForm;
import com.ycl.domain.query.ProgressPlanQuery;
-import com.ycl.domain.vo.ProjectProgressFileListsRequest;
+import com.ycl.domain.form.ProjectProgressFileListsForm;
import com.ycl.mapper.FileMapper;
import com.ycl.service.ProgressPlanService;
import io.swagger.annotations.Api;
@@ -73,7 +73,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
// @PreAuthorize("hasAuthority('progressPlan:detail')")
- public Result detail(@PathVariable("id") Integer id) {
+ public Result detail(@PathVariable("id") Long id) {
return progressPlanService.detail(id);
}
@@ -85,12 +85,12 @@
}
@PostMapping("/saveProjectProgressFileLists")
- public Result saveProjectProgressFileLists(@RequestBody ProjectProgressFileListsRequest request) {
- return progressPlanService.saveProjectProgressFileLists(request);
+ public Result saveProjectProgressFileLists(@RequestBody ProjectProgressFileListsForm form) {
+ return progressPlanService.saveProjectProgressFileLists(form);
}
@GetMapping("/getProjectProgressForm/{id}")
- public Result getProjectProgressForm(@PathVariable("id") Integer id) {
+ public Result getProjectProgressForm(@PathVariable("id") Long id) {
return progressPlanService.getProjectProgressForm(id);
}
--
Gitblit v1.8.0