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

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -11,13 +11,13 @@
 */
public interface SysLaboratoryService {

   List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize);
   List<SysLaboratory> getSysLaboratoryList(String type, String name, String project, Integer first, Integer pageSize);

   List<SysLaboratory> getAllSysLaboratoryList();

   List<SysLaboratory> getSysLaboratoryListByDep(String depId);

   int getSysLaboratoryTotalCount(String type, String name);
   int getSysLaboratoryTotalCount(String type, String name,String project);

   boolean isSysLaboratoryExist(String barCode, String editId);

@@ -38,4 +38,8 @@
   List<Map> exportLabList(String type, String name);

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

   List<SysLaboratory> getSysLaboratoryListByUserId(String userId);


}