From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 8df6b0e..e8455ae 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.ZfEvent;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -21,10 +22,14 @@
AjaxResult selectDataList(ZfEquipment zfEquipment, Integer pageNum, Integer pageSize);
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