From 332125c247b8cec21af77479f07ef35558eb6bba Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:24:09 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 394fb22..9602a9e 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -157,6 +157,7 @@
treeDevice: "/deviceScope/treeDevice", // 璁惧鏍戝舰
temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000鏁伴噰
temDataAcquisition2: "/deviceScope/temDataAcquisition2", // PK8000鏁伴噰--澶氭潯
+ formulaCalculation: "/deviceScope/formulaCalculation", // 鏁伴噰-鍏紡璁＄畻
}
const insOrder = {
--
Gitblit v1.9.3