Merge remote-tracking branch 'origin/master'

xyc

2024-10-12 5cea5dff7f0d73c1b172252936b393fb390ab669

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java

@@ -107,8 +107,8 @@
    }

    @GetMapping("getStatus")
    public Result<String> getTimeDiagram(Long productId, Long taskId, Long fzId) {
        String data = simulatAssessService.getTimeDiagram(productId, taskId, fzId);
    public Result<TimeDiagramDto> getTimeDiagram(Long productId, Long taskId, Long fzId, double smallWidth,double minPointNum) {
        TimeDiagramDto data = simulatAssessService.getTimeDiagram(productId, taskId, fzId, smallWidth,minPointNum);
        return Result.ok(data);
    }

@@ -160,6 +160,8 @@
    }




    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")