From d75541110d428f61a9fe3378110248b7dd78e240 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 21 五月 2025 12:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java | 4 ++--
1 files changed, 2 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..97eefb8 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,8 +53,8 @@
@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