From 735ae20e44301fb8d3cca67170aa8912138494e9 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期一, 14 四月 2025 16:37:23 +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/ApsGasPipingPlanController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
index aa886be..a255e26 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
@@ -144,9 +144,11 @@
     {
         return toAjax(apsGasPipingPlanService.deleteApsGasPipingPlanByIds(ids));
     }
+
     /**
      * 姘斾綋绠¤矾璁″垝瀵煎叆
      */
+    @RequiresPermissions("gasPiping:import")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<ApsGasPipingPlanTemp> util = new ExcelUtil<ApsGasPipingPlanTemp>(ApsGasPipingPlanTemp.class);
@@ -198,8 +200,8 @@
      * @Author: wwj
      * @Date: 2025/4/9
      */
-    @GetMapping("/confirmGasPiping")
-    public AjaxResult confirmGasPiping(ApsGasPipingPlanTemp apsGasPipingPlanTemp) {
+    @PostMapping("/confirmGasPiping")
+    public AjaxResult confirmGasPiping(@RequestBody ApsGasPipingPlanTemp apsGasPipingPlanTemp) {
         return toAjax(apsGasPipingPlanService.confirmGasPiping(apsGasPipingPlanTemp));
     }
 }

--
Gitblit v1.9.3