Merge remote-tracking branch 'origin/master'

xyc

2024-10-28 b02c7eb73aabc8531b6e52b02fc15489f0441b52

 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,7 +65,7 @@

    @GetMapping("checkTaskModel")
    @ApiOperation("任务模型完整性检查")
    public Result<List<TaskModelCheckResult>> checkTaskModel(Long productId){
    public Result<List<TaskModelCheckResultDto>> checkTaskModel(Long productId){
//        List<TaskModelCheckResult> checkResult = taskService.checkTaskModel(productId);
//        return Result.ok(checkResult);
        return Result.ok();