Merge remote-tracking branch 'origin/master'

zhangherong

8 天以前 d6372da6f37778e90a4bae02865e8ec77e980b6e

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java

@@ -87,7 +87,7 @@
    /**
     * 点检表导入入口
     */
    public Result<?> importPointInspectionExcel(MultipartFile file);
    Result<?> importPointInspectionExcel(MultipartFile file);


    Result<?> importMaintenanceStandard(MultipartFile file, String type);