From c8abec662e3c634365a9aeeda5c57e0f0e51cb41 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 16:44:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
index dbcc902..7f3de63 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java
@@ -132,9 +132,9 @@
@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
@PostMapping("/confirmData")
public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-// LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
- apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
+ apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
return AjaxResult.success("纭鎴愬姛锛�");
}
}
--
Gitblit v1.9.3