From e5a96bc789ca0252e31fd2e01bec5e471a02c0d6 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 17:57:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java
index 347af56..00b1f3c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java
@@ -53,9 +53,11 @@
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
 
-        int i = apsMaterialProductGroupManagementService.batchInsertApsMaterialProductGroupManagement(file);
-        return  toAjax(i);
+        apsMaterialProductGroupManagementService.batchInsertApsMaterialProductGroupManagement(file);
+        return  toAjax(true);
     }
+
+
     /**
      * 瀵煎嚭鐗╂枡浜у搧缁勬暟鎹鐞嗗垪琛�
      */

--
Gitblit v1.9.3