From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
index b320af0..bcb724b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
+++ b/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);

--
Gitblit v1.9.3