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/IZfPropertyService.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
index dd9a2b3..e5a6790 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -1,9 +1,12 @@
 package com.ruoyi.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZfEquipment;
 import com.ruoyi.domain.ZfProperty;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -14,4 +17,24 @@
 public interface IZfPropertyService extends IService<ZfProperty>
 {
 
+    List<ZfProperty> selectByCondition(ZfProperty zfProperty);
+
+    AjaxResult selectDataList(ZfProperty zfProperty,Integer pageNum,Integer pageSize);
+    List<ZfProperty> selectByIds(Long[] ids);
+
+    AjaxResult selectType();
+
+    List<ZfProperty> selectByFamilyIds(Long[] familyIds);
+    AjaxResult addData(ZfProperty zfProperty);
+
+    AjaxResult updateData(ZfProperty zfProperty);
+
+    AjaxResult deleteData(Long[] ids);
+
+//    AjaxResult addData2(ZfProperty zfProperty);
+
+    AjaxResult importExcel(MultipartFile file);
+
+    AjaxResult listType();
+
 }

--
Gitblit v1.9.1