From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
index 65d660a..0a421a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.core.dto.PersonDto;
import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛淇℃伅琛�
@@ -38,5 +40,9 @@
int delUserDepardLimsId(Integer id);
+ int addPersonUser(PersonDto personDto);
+
+ Map<String, List<Map<String,Object>>> getLaboratoryPersonList();
+
}
--
Gitblit v1.9.3