From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/components/basicInformation/organization/AddOrEditOrganization.jsx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/components/basicInformation/organization/AddOrEditOrganization.jsx b/gz-customerSystem/src/components/basicInformation/organization/AddOrEditOrganization.jsx
index c998d98..62d8c8e 100644
--- a/gz-customerSystem/src/components/basicInformation/organization/AddOrEditOrganization.jsx
+++ b/gz-customerSystem/src/components/basicInformation/organization/AddOrEditOrganization.jsx
@@ -100,7 +100,7 @@
>
<Row gutter={[24, 16]}>
<Col span={8}>
- <Form.Item label="组织名称" name="name" required rules={[{ required: true }]}>
+ <Form.Item label="组织名称" name="unitName" required rules={[{ required: true }]}>
<Input placeholder="请输入" allowClear />
</Form.Item>
</Col>
--
Gitblit v1.8.0