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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

 src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java

@@ -142,6 +142,16 @@
        return dataModel;
    }

    public void export2Excel(){
        List<Map> list = sysSupplierService.exportExcelList(name);
        try{
            sysSupplierService.export2Excel(list);
        }catch (Exception e){
            e.printStackTrace();
            FacesUtils.warn("导出失败");
        }
    }

    public void uploadSupplier(FileUploadEvent event){
        try {
            sysSupplierService.importSupplier(event);