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/MyUpload/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gz-customerSystem/src/components/MyUpload/index.jsx b/gz-customerSystem/src/components/MyUpload/index.jsx
index 2949f8c..d17a4f9 100644
--- a/gz-customerSystem/src/components/MyUpload/index.jsx
+++ b/gz-customerSystem/src/components/MyUpload/index.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-05 17:14:00
- * @LastEditTime: 2024-08-15 09:56:54
+ * @LastEditTime: 2024-08-15 16:28:01
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 公共上传组件
@@ -164,7 +164,7 @@
) : (
<Dragger {...props}>
<p className="ant-upload-drag-icon">
- {fileIcon ? <PlusOutlined style={{ color: 'rgba(0, 0, 0, 0.65)' }} /> :
+ {fileIcon ? <PlusOutlined style={{ color: 'rgba(0, 0, 0, 0.65)' ,width:'24px'}} /> :
<CloudUploadOutlined />}
</p>
<p style={{ fontSize: '14px' }}>点击上传图标或拖拽文件至此区域上传</p>
--
Gitblit v1.8.0