From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码

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

diff --git a/src/api/equipmentManagement/brand.js b/src/api/equipmentManagement/brand.js
index fd46a80..040cb38 100644
--- a/src/api/equipmentManagement/brand.js
+++ b/src/api/equipmentManagement/brand.js
@@ -90,3 +90,4 @@
 }
 
 
+

--
Gitblit v1.9.3