Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

 Source/UBCS-WEB/src/components/Master/MasterTree.vue

@@ -6,7 +6,7 @@
        <span v-html="node.label"></span>
      </template>
    </avue-tree>
    <div style="display: inline-block;"><i class="el-icon-refresh refresh-icon" @click="getTreeLists"></i></div>
    <div style="display: inline-block;"><el-link icon="el-icon-refresh" class="refresh-icon" @click="getTreeLists"></el-link></div>
  </div>
</template>


 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -1656,4 +1656,4 @@
  width: 500px;
}

</style>
</style>

 Source/UBCS-WEB/src/views/level/levelPage.vue

对比新文件
@@ -0,0 +1,13 @@
<template>

</template>

<script>
export default {
  name: "levelPage"
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/src/views/modeling/Business.vue

@@ -2,14 +2,14 @@
  <el-container>
    <el-header class="businessHeader" style="height: 40px;padding:0 8px">
      <div>
        <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="businessAdd">
        <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="businessAdd" plain>
          鏂板
        </el-button>
        <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit">
        <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit" plain>
          淇敼
        </el-button>
        <el-button v-if="permissionList.table" icon="el-icon-thumb" size="small" type="primary"
                   @click="selectFromTable"> 浠庡凡鏈変腑鑾峰彇
                   @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
        </el-button>
      </div>
    </el-header>

 Source/UBCS-WEB/src/views/modeling/LinkType.vue

@@ -3,10 +3,10 @@
        <!-- 椤剁鎸夐挳 -->
        <el-header class="businessHeader" style="height: 40px;">
          <div>
            <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn">
            <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn" plain>
              鏂板
            </el-button>
            <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn">
            <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn" plain>
              淇敼
            </el-button>
          </div>