Merge remote-tracking branch 'origin/master'

zhangherong

9 天以前 c557836de5be6a7de591a7cdea6b400ff75b8213

 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);