From 05b430789fa8b375acc6e4d4abd98f89c430e3a7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 九月 2025 10:05:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 123da95..b50f88f 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -4,10 +4,13 @@
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -87,6 +90,20 @@
}
/**
+ * 渚涘簲鍟嗗鍏�
+ */
+ @PostMapping("/import")
+ @Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
+ public AjaxResult importData(MultipartFile file) {
+ Boolean b = supplierService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
+ }
+
+
+ /**
* 渚涘簲鍟嗛�夐」鎺ュ彛
* @return
*/
--
Gitblit v1.9.3