2022-10-31

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -152,11 +152,7 @@ export default {
         },
         {
           label:'负责人',
-<<<<<<< HEAD
-          value:this.mainData.leader[0]?this.mainData.leader[0].name:""
-=======
           value:this.mainData.leader.length === 0?"--":this.mainData.leader[0].name
->>>>>>> 8be118da8263bf7cea1e45cdd92c84cc2cd45a40
         },
         {
           label:'最近跟近时间',