From 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 17:12:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |    9 +++++++++
 1 files changed, 9 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 f96c1bb..00d3ad2 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
@@ -203,6 +203,8 @@
             device.setStorageUrl(dataConfigList.getStorageUrl());
             device.setIp(dataConfigList.getIp());
             device.setFileType(dataConfigList.getFileType());
+            device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
+            device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
             deviceService.updateById(device);
         } else {
             dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
@@ -247,5 +249,12 @@
         dataConfigService.removeBatchByIds(collect);
         return Result.success();
     }
+
+    @ValueAuth
+    @ApiOperation(value = "鑿滃崟")
+    @PostMapping("/menu")
+    public Result menu() {
+        return Result.success(deviceService.menu());
+    }
 }
 

--
Gitblit v1.9.3