From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 26 Jan 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 89e4772..a613193 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -41,7 +41,7 @@
List<SysUserDto> getUserInfo();
- HazardousWasteUser getUserByAccount(String account);
+ HazardousWasteUser getUserByAccount(String account,String name);
List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
}
--
Gitblit v1.9.2