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

xiaogang

2021-08-20 47f882588d1d18df404478bc79cc53cb608549a2

 service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java

old mode 100644
new mode 100755
@@ -27,13 +27,12 @@
    private IAssetExportSMO assetExportSMOImpl;

    /**
     * 添加应用数据
     * 资产导入方法 将Excel中的数据直接导入到表里
     *
     * @param pd 页面数据封装
     * @return ResponseEntity 对象
     */
    public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception{

        return assetImportSMOImpl.importExcelData(pd,uploadFile);
    }