Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-25 f04c1a5a967679b9984926af72be8a3d3f26c2bb

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java

@@ -57,8 +57,8 @@
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "inspectionMaterialListId", value = "样品ID", dataTypeClass = Integer.class, required = true),
    })
    @PostMapping("/selectInspectionMaterialListById")
    public Result selectInspectionMaterialListById(int inspectionMaterialListId) throws Exception {
    @PutMapping("/selectInspectionMaterialListById/{inspectionMaterialListId}")
    public Result selectInspectionMaterialListById(@PathVariable Integer inspectionMaterialListId) {
        return Result.success(inspectionMaterialListService.getById(inspectionMaterialListId));
    }

@@ -67,7 +67,7 @@
            @ApiImplicitParam(name = "inspectionMaterialListId", value = "样品ID", dataTypeClass = Integer.class, required = true),
    })
    @PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
    public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
    public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
        return Result.success(inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId,inspectionMaterialList));
    }