解决冲突

src/components/ledger/handsontables/system.vue

@@ -393,11 +393,7 @@ export default {
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,
-<<<<<<< HEAD
         // observeChanges: false, //启用observeChanges插件
-=======
-        observeChanges: false,
->>>>>>> 48591ac128a8a8afb10aaeee8316d8df9b5bbe15
         // colWidths: 200,
         autoColumnSize: true,
         language: "zh-CN",