pull

6 months ago · 348fb328ba
parent 1f4f9b19cc
commit 348fb328ba
1 changed files with 0 additions and 5 deletions
--- 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
          }
        },
        {