From c19e349f8c93ff63b56fa550ab38d68d67c6905b Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 14 Aug 2024 11:29:49 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/basicInformation/organization/index.less | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/views/basicInformation/organization/index.less b/gz-customerSystem/src/views/basicInformation/organization/index.less
index 543a62e..5b8d9c6 100644
--- a/gz-customerSystem/src/views/basicInformation/organization/index.less
+++ b/gz-customerSystem/src/views/basicInformation/organization/index.less
@@ -111,4 +111,7 @@
.arco-btn-primary:not(.arco-btn-disabled) {
background-color: @main-color;
-}
\ No newline at end of file
+}
+
+
+
--
Gitblit v1.8.0