Merge remote-tracking branch 'origin/master' into master

gdg

2021-01-18 b02535c9a99324823812f6c2d08f066d8e1ba75f

 src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java

@@ -1,8 +1,10 @@
package com.nanometer.smartlab.service;

import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;

import java.util.List;
import java.util.Map;

/**
 * Created by cmower on 17/11/20.
@@ -31,4 +33,9 @@

   void insertSysReagentList(List<SysLaboratory> sysLaboratoryList);

    void exportLab2Excel(List<Map> list) throws  Exception;

   List<Map> exportLabList(String type, String name);

   List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project);
}