Merge branch 'dev' into 'test'

premission

See merge request quanshu/mp-ui-pc!96

src/views/business/channel/index.vue

@@ -98,7 +98,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['system:user:add']"
+              v-hasPermi="['business:channel:add']"
             >添加一级渠道</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>