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

diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index 3167be5..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)

--
Gitblit v1.8.0