diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 8e78f72..7005d50 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1011,7 +1011,6 @@ export default {
           width: 320,
           align: "left",
           customFn: (row) => {
-<<<<<<< HEAD
             {
               return row.money_way_detail.map(item => {
                 return (<div> {
@@ -1019,10 +1018,6 @@ export default {
                 } </div>)
               })
             }
-
-=======
-            return row.money_way_detail.map(item => item.value).join('，')
->>>>>>> 63e03e782c42ae25b19c134f0122ebea25289907
           }
         },
         {