Merge remote-tracking branch 'origin/master'

Lius

7 天以前 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd

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

@@ -52,7 +52,7 @@
     * @param maintenanceCategory 保养类型
     * @return
     */
    EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory);
    EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory,String standardStatus);

    /**
     * 查询标准列表-前端展示该用户拥有的标准
@@ -87,7 +87,7 @@
    /**
     * 点检表导入入口
     */
    public Result<?> importPointInspectionExcel(MultipartFile file);
    Result<?> importPointInspectionExcel(MultipartFile file);


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