Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

shuishen

2021-09-18 29c70ac9c7d7f23471cd6dfdb305c3aa99f1dccc

 src/views/authority/role.vue

@@ -256,8 +256,10 @@
  methods: {
    initData(roleId) {
      getRoleTreeById(roleId).then((res) => {
        const column = this.findObject(this.option.column, "parentId");
        column.dicData = res.data.data;
        try {
          const column = this.findObject(this.option.column, "parentId");
          column.dicData = res.data.data;
        } catch {}
      });
    },
    submit() {