From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突

---
 src/api/equipment/equipment.js |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/api/equipment/equipment.js b/src/api/equipment/equipment.js
index 1050e3b..7b86def 100644
--- a/src/api/equipment/equipment.js
+++ b/src/api/equipment/equipment.js
@@ -75,4 +75,19 @@
     url: '/mes/equipment/page/' + id,
     method: 'get'
   })
+}
+
+export function getDeviceId() {
+  return request({
+    url: '/mes/mqtt/getDeviceId',
+    method: 'get'
+  })
+}
+
+export function mqttList(query) {
+  return request({
+    url: '/mes/mqtt/mqttList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file

--
Gitblit v1.9.3