份

pages/materiel/classification/add.vue

@@ -162,13 +162,9 @@ export default {
         {
           title: "备注",
           key: "note",
-<<<<<<< HEAD
           align: "center",
           slot: "note",
           width: "150"
-=======
-          slot: "note"
->>>>>>> 7667d67eff74481dc10aa4e1489266881dc30077
         },
        
         // {
@@ -208,11 +204,6 @@ export default {
         {
           title: "操作",
           slot: "action",
-<<<<<<< HEAD
-
-=======
-          width: 80,
->>>>>>> 7667d67eff74481dc10aa4e1489266881dc30077
           align: "center"
         }
       ],

pages/materiel/classification/edit.vue

@@ -162,7 +162,6 @@ export default {
           key: "note",
           slot: "note"
         },
-<<<<<<< HEAD
         {
           title: "属性类型",
           key: "dataType",
@@ -175,15 +174,6 @@ export default {
           align: "center",
           slot: "unitName"
         },
-=======
-       
-        // {
-        //   title: "是否显示",
-        //   key: "result",
-        //   align: "center",
-        //   slot: "result"
-        // },
->>>>>>> 7667d67eff74481dc10aa4e1489266881dc30077
         {
           title: "必填",
           key: "required",