From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突

---
 src/api/cnas/resourceDemand/device.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 82376f5..b82cf37 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -913,3 +913,4 @@
     params: query,
   });
 }
+

--
Gitblit v1.9.3