From 4d9364da736f322cfeeec2815e83f2a3f6534223 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 96dd926..af19300 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
@@ -279,5 +279,12 @@
public Result treeDevice(String deviceName) {
return Result.success(deviceService.treeDevice(deviceName));
}
+
+
+ @ApiOperation(value = "娓╁害寰幆鏁伴噰鎬讳綋")
+ @PostMapping("/temDataAcquisition2")
+ public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
+ return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
+ }
}
--
Gitblit v1.9.3