Merge remote-tracking branch 'origin/master'

zhangherong

10 天以前 801ca1dee874739c42d215d6eba5e5caf2a45f1d

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