Merge remote-tracking branch 'origin/master'

zss

2023-08-23 35bf80accf4117e3de030fdd7e3962f16a5fcfd9

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

@@ -34,11 +34,7 @@
    @Autowired
    private ProductModelService productModelService;

    @ApiOperation(value = "选择样品名称")
    @GetMapping("/selectmater")
    public Result selectmater() {
        return Result.success(productModelService.selectmater());
    }


    @ApiOperation(value = "添加标准-->选择项目分组")
    @GetMapping("/selectfather")