Merge branch 'ap' into dev

src/views/promotion/display_schedule_dashboard/components/Table/index.vue

@@ -5,7 +5,8 @@
       <el-form-item>
         <el-radio-group v-model="operation">
           <el-radio-button label="大区战区-分析"
-            value="大区战区-分析" />
+            value="大区战区-分析"
+            v-hasPermi="['promotion:dashboard:list-show']" />
           <el-radio-button label="城市经理-分析"
             value="城市经理-分析" />
         </el-radio-group>