From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index e93f447..42b997e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -33,7 +33,7 @@
private HeaderToken headerToken;
/**
- * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ *type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
* @param user
* @param type
@@ -96,5 +96,16 @@
return Result.success(userService.addPersonUser(personDto));
}
+ /**
+ * 鑾峰彇瀹為獙瀹や笅鐨勬楠屽憳鍒楄〃
+ * @return
+ */
+ @ApiOperation(value = "鑾峰彇瀹為獙瀹や笅鐨勬楠屽憳鍒楄〃")
+ @GetMapping("/getLaboratoryPersonList")
+ public Result<?> getLaboratoryPersonList() {
+ return Result.success(userService.getLaboratoryPersonList());
+ }
+
+
}
--
Gitblit v1.9.3