From 49bb5b44654b325d5da87cd6491cb8f93f6121aa Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 15 Aug 2024 18:13:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/components/personCard/index.jsx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/components/personCard/index.jsx b/gz-customerSystem/src/components/personCard/index.jsx
index 11c098c..987bdae 100644
--- a/gz-customerSystem/src/components/personCard/index.jsx
+++ b/gz-customerSystem/src/components/personCard/index.jsx
@@ -57,7 +57,7 @@
}
<Space style={{ display: 'flex', flexWrap: 'wrap' }}>
{x.remark?.map((item, index) => (
- <div key={index} style={{ lineHeight: '22px', padding: '0px 8px', backgroundColor: `${item.color}`, width: 'fit-content', borderRadius: '4px', marginTop: '4px' }}>{item.label}</div>
+ <div key={index} style={{ lineHeight: '22px', padding: '0px 8px', backgroundColor: `${item.color}`, width: 'fit-content', borderRadius: '4px', marginTop: '4px', color: '#fff' }}>{item.label}</div>
))}
</Space>
</div>
--
Gitblit v1.8.0