From c3ee76c79cc5c5db479b548e1b4eca67327e7396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 11:28:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 6c3998f..2725613 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -224,12 +224,4 @@
     public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
         return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
     }
-
-    @ApiOperation(value = "鏁伴噰-鍏紡璁$畻")
-    @PostMapping("/formulaCalculation")
-    @ValueAuth
-    public Result<?> formulaCalculation(@RequestBody Map<String, Object> map) {
-        return Result.success(deviceService.formulaCalculation(map, false));
-    }
-}
-
+}
\ No newline at end of file

--
Gitblit v1.9.3