From f086664481f69eda8a5dd30747b3ed7cb496b9ba Mon Sep 17 00:00:00 2001
From: Calvin <2440603509@qq.com>
Date: 星期三, 31 七月 2024 09:53:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

---
 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 862d38e..c574998 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -3,7 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.Custom;
+import com.yuanchu.mom.pojo.Custom;
 import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.pojo.User;
 import com.yuanchu.mom.service.CustomService;
@@ -153,6 +153,13 @@
         return Result.success(customService.addCustom(custom));
     }
 
+    @ValueClassify("瀹㈡埛绠$悊")
+    @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
+    @PostMapping("/upCustom")
+    public Result<?> upCustom(@RequestBody Custom custom) {
+        return Result.success(customService.upCustom(custom));
+    }
+
     //鑾峰彇璁惧璐熻矗浜�
     @ValueAuth
     @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
@@ -196,4 +203,11 @@
         return Result.success(userService.delUserDepardLimsId(id));
     }
 
+    @ValueAuth
+    @GetMapping ("/selectCustomEnum")
+    @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+    public Result<?> selectCustomEnum(){
+        return Result.success(customService.selectCustomEnum());
+    }
+
 }

--
Gitblit v1.9.3