From b5f919e8cc4301b71ff6b12de93f7aefc823ca6d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 21 十月 2025 09:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 790c975..35a9a63 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -1,7 +1,11 @@
package com.ruoyi.basic.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -26,7 +30,7 @@
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
- List<Customer> selectCustomerList(Customer customer);
+ IPage<Customer> selectCustomerList(Page page, Customer customer);
/**
* 鏂板瀹㈡埛妗ｆ
@@ -60,4 +64,8 @@
* @return 缁撴灉
*/
List customerList(Customer customer);
+
+ List<Customer> selectCustomerLists(Customer customer);
+
+ AjaxResult importData(MultipartFile file);
}
--
Gitblit v1.9.3