From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 09:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
index 7cd4783..581b524 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -1,6 +1,8 @@
package com.nanometer.smartlab.dao;
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 org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;
@@ -46,5 +48,7 @@
List<SysUserDto> selectUserInfo();
- SysUser getUserByAccount(Map params);
+ HazardousWasteUser getUserByAccount(Map params);
+
+ List<LaboratoryVo.LaboratoryUser> getUserByProject(@Param("project") String project);
}
--
Gitblit v1.9.2