更新表单验证失败问题

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: [
           {