Merge remote-tracking branch 'origin/master'

zss

2023-08-23 58579a382615c0f9bd03b52ae7227a2ca64f43f3

 standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java

@@ -60,12 +60,9 @@
    }

    @ApiOperation(value = "标准库-->物料-->侧边栏四级展开")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(value = "型号/型号名称", name = "specificationName", dataTypeClass = String.class)
    })
    @GetMapping("/list")
    public Result<?> getFourLevelInformation(String specificationName) {
        List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation(specificationName);
    public Result<?> getFourLevelInformation() {
        List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation();
        return Result.success(fourLevelInformation);
    }
}