解决冲突

mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue

@@ -101,7 +101,7 @@ const defaultForm = { product_area: 'A1', workprocedure_id: '1535144552481034240
 
 export default {
   name: 'SKdevice',
-  components: { crudOperation, pagination,  rrOperation },
+  components: { crudOperation, pagination, rrOperation },
   dicts: ['product_area'],
   cruds() {
     return [
@@ -139,7 +139,7 @@ export default {
         this.notify('保存成功', 'success')
       }).catch(() => {
       })
-    },
+    }
   }
 }
 </script>