From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 794b3a9..a613193 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -2,6 +2,9 @@
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
+import com.nanometer.smartlab.entity.dto.SysUserDto;
import java.util.List;
import java.util.Map;
@@ -36,5 +39,9 @@
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
+ List<SysUserDto> getUserInfo();
+ HazardousWasteUser getUserByAccount(String account,String name);
+
+ List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
}
--
Gitblit v1.9.2