feat：解决冲突

apps/bigmember_pc/src/views/order/components/common/form.vue

@@ -62,11 +62,7 @@ export default {
             phone: this.form.phone
           },
           this.form,
-<<<<<<< HEAD
-          { phone: token ? phone : data.phone }
-=======
-          { phone: data.phone, reportMail: data.reportMail }
->>>>>>> main
+          { phone: token ? phone : data.phone, reportMail: data.reportMail }
         )
         this.updateFormStatus(this.form)
       }