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/ZfCollectionService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
index 4b84d99..73da51d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
@@ -22,7 +22,16 @@
List<ZfCollection> selectByCondition(ZfCollection zfCollection);
+ List<ZfCollection> selectByIds(Long[] ids);
AjaxResult importExcel(MultipartFile file);
- AjaxResult addData2(ZfCollection zfCollection);
+// AjaxResult addData2(ZfCollection zfCollection);
+
+ AjaxResult addData(ZfCollection zfCollection);
+
+ AjaxResult updateData(ZfCollection zfCollection);
+
+ AjaxResult deleteData(Long[] ids);
+
+ AjaxResult listType();
}
--
Gitblit v1.9.1