fix

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -1082,14 +1082,9 @@ export default {
       this.ruleForm.F_IDNumberShow =  this.patientDatas.zjhmShow
       this.ruleForm.F_CusAddress = this.patientDatas.jtdz
       this.ruleForm.F_CusAddressShow =  this.patientDatas.jtdzShow
-<<<<<<< HEAD
-      this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
-      this.clickbefore = 0
-=======
       // this.patientMsgAll[0].guanchuangyisheng = this.ruleForm.F_Customer
       this.clickbefore = 0
 
->>>>>>> master
     },
     'orderTypeData.F_Type2': function() {
       this.ruleForm.clbm = ''