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

gdg

2021-01-08 aaec4271422fa9798ecc55901ad17f9557282806

 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java

@@ -27,4 +27,6 @@
    public SysLaboratory getSysLaboratoryByBarCodeForExport(String barCode) throws DataAccessException;

    public  void updateLabExport(SysLaboratory sysLaboratory);

    List<Map> exportLabList(Map params);
}