From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
index 183d77c..17ac4eb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
@@ -11,7 +11,7 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
-import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResult;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
import com.zt.life.modules.mainPart.taskReliability.model.Task;
import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import io.swagger.annotations.Api;
@@ -65,9 +65,10 @@
@GetMapping("checkTaskModel")
@ApiOperation("浠诲姟妯″瀷瀹屾暣鎬ф鏌�")
- public Result<List<TaskModelCheckResult>> checkTaskModel(Long productId){
- List<TaskModelCheckResult> checkResult = taskService.checkTaskModel(productId);
- return Result.ok(checkResult);
+ public Result<List<TaskModelCheckResultDto>> checkTaskModel(Long productId){
+// List<TaskModelCheckResult> checkResult = taskService.checkTaskModel(productId);
+// return Result.ok(checkResult);
+ return Result.ok();
}
@PostMapping
--
Gitblit v1.9.1