From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
index 54c77ae..6eee650 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
+++ b/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")

--
Gitblit v1.9.3