From 480af1ab454d6c13bc94a5ec4919095dd4b880b0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 16 四月 2025 17:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
index 50e8760..ccaa95c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java
@@ -170,4 +170,14 @@
public AjaxResult confirmWeldSeam(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp) {
return toAjax(apsWeldSeamService.confirmWeldSeam(apsWeldSeamTemp));
}
+
+ /**
+ * 鏌ヨ鐒婄紳鍥捐〃
+ */
+ @RequiresPermissions("weldSeam:weldSeam:weldSeamEchartsList")
+ @GetMapping("/weldSeamEchartsList")
+ public AjaxResult weldSeamEchartsList(ApsWeldSeam apsWeldSeam) {
+ List<List<String>> list = apsWeldSeamService.weldSeamEchartsList(apsWeldSeam);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3