From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index c23cb69..5d1dba2 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
@@ -35,7 +35,6 @@
const handleScaned = () => {
setScaned(true)
const content = fileView.response.data.ocrResult.wordsResult.join('\n')
-
setTimeout(() => {
console.log(formRef.current, content);
formRef.current.setFieldValue('scanContent', content)
@@ -84,7 +83,6 @@
}}
tip='支持png、 jpg、pdf等格式文件上传，每次上传大小不超过10M'
showUploadList={{
- // Please dont remove this comment
fileIcon: <IconLink style={{ color: '#1D2129' }} />,
}}
// onChange={(info, currentFile) => {
--
Gitblit v1.8.0