From 56016b4e4bfa134c2b8462227cfe92ccc4b98c1d Mon Sep 17 00:00:00 2001
From: fengyu <fengyu@example.com>
Date: Thu, 8 Sep 2022 17:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A1=A8=E5=8D=95=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/item-deal-detail-view.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index b536d868..12b61ff5 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -600,15 +600,11 @@ export default {
             message: '请输入办公电话',
             trigger: 'blur'
           },
-<<<<<<< HEAD
           {
             pattern: /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/,
             message: '请输入正确的办公电话',
             trigger: 'blur'
           }
-=======
-          { pattern: /^[1][1,2,3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确号码格式', trigger: 'blur' }
->>>>>>> 1918fab72f3f31b39588a0c7f4df335174e95ac2
         ],
         categoryIds: [
           {