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/SysLaboratoryDao.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java index 0ceead8..ea7e094 100644 --- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java +++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java @@ -1,6 +1,8 @@ package com.nanometer.smartlab.dao; import com.nanometer.smartlab.entity.SysLaboratory; +import com.nanometer.smartlab.entity.dto.LaboratoryVo; +import org.apache.ibatis.annotations.Param; import org.springframework.dao.DataAccessException; import java.util.List; @@ -29,4 +31,6 @@ public void updateLabExport(SysLaboratory sysLaboratory); List<Map> exportLabList(Map params); + + List<LaboratoryVo.Laboratory> getLaboratoryByProject(@Param("project") String project); } -- Gitblit v1.9.2