From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
index 428f483..e8455ae 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
@@ -24,8 +24,12 @@
List<ZfEquipment> selectByCondition(ZfEquipment zfEquipment);
List<ZfEquipment> selectByIds(Long[] ids);
AjaxResult addData(ZfEquipment zfEquipment);
- AjaxResult addData2(ZfEquipment zfEquipment);
+// AjaxResult addData2(ZfEquipment zfEquipment);
AjaxResult importExcel(MultipartFile file);
+
+ AjaxResult updateData(ZfEquipment zfEquipment);
+
+ AjaxResult deleteData(Long[] ids);
}
--
Gitblit v1.9.1