From 9f99167aba3720cb731298511f8423b18c08e5a2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 05 三月 2026 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 35a9a63..989e474 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -3,11 +3,13 @@
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.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
+import java.util.Map;
/**
* 瀹㈡埛妗ｆService鎺ュ彛
@@ -25,12 +27,20 @@
Customer selectCustomerById(Long id);
/**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
+ */
+ CustomerDto selectCustomerDetailById(Long id);
+
+ /**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
- IPage<Customer> selectCustomerList(Page page, Customer customer);
+ IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer);
/**
* 鏂板瀹㈡埛妗ｆ
@@ -63,7 +73,7 @@
*
* @return 缁撴灉
*/
- List customerList(Customer customer);
+ List<Map<String, Object>> customerList(Customer customer);
List<Customer> selectCustomerLists(Customer customer);
--
Gitblit v1.9.3