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

gdg

2020-12-18 20e1449578ac0e558dc038e302001d3a6819ab2c

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

@@ -4,6 +4,7 @@
import org.primefaces.event.FileUploadEvent;

import java.util.List;
import java.util.Map;

/**
 * Created by johnny on 17/11/29.
@@ -23,4 +24,8 @@
    public boolean deleteSysSupplier(List<SysSupplier> sysSupplierList);

    void importSupplier(FileUploadEvent event) throws Exception;

    List<Map> exportExcelList(String name);

    void export2Excel(List<Map> list) throws Exception;
}