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.jsx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gz-customerSystem/src/views/basicInformation/organization/index.jsx b/gz-customerSystem/src/views/basicInformation/organization/index.jsx
index 86858dc..2eb9939 100644
--- a/gz-customerSystem/src/views/basicInformation/organization/index.jsx
+++ b/gz-customerSystem/src/views/basicInformation/organization/index.jsx
@@ -2,7 +2,7 @@
  * @Company: hugeInfo
  * @Author: ldh
  * @Date: 2022-02-18 15:04:13
- * @LastEditTime: 2024-08-06 15:57:16
+ * @LastEditTime: 2024-08-13 16:04:30
  * @LastEditors: dminyi 1301963064@qq.com
  * @Version: 1.0.0
  * @Description: 组织架构

--
Gitblit v1.8.0