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

gdg

2020-12-18 20e1449578ac0e558dc038e302001d3a6819ab2c

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

@@ -24,4 +24,6 @@
    public int deleteSysSupplier(List<String> ids) throws DataAccessException;

    void insertBatch(List<?> list);

    List<Map> exportExcelList(Map<String, String> params);
}