From 8f98ff2e202e5d7a39be484753db63d0165d70d7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 3 ++-
1 files changed, 2 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 4ec8646..35a9a63 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,6 +4,7 @@
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;
@@ -66,5 +67,5 @@
List<Customer> selectCustomerLists(Customer customer);
- Boolean importData(MultipartFile file);
+ AjaxResult importData(MultipartFile file);
}
--
Gitblit v1.9.3