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

gdg

2020-12-18 20e1449578ac0e558dc038e302001d3a6819ab2c

 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);
}