Merge branch 'dev' into 'master'

feat：公告管理

See merge request !28

src/router/index.js

@@ -66,6 +66,12 @@ const routes = [
         meta: { title: '定时任务' },
         meta: { title: '定时任务' },
       },
       },
       {
       {
+        path: '/saas/announceManage',
+        component: () => import('@/views/system/announceManage.vue'),
+        name: 'system_announce_manage',
+        meta: { title: '公告管理' },
+      },
+      {
         path: '/saas/countryCode',
         path: '/saas/countryCode',
         component: () => import('@/views/system/countryCode.vue'),
         component: () => import('@/views/system/countryCode.vue'),
         name: 'system_countryCode',
         name: 'system_countryCode',

src/views/home/navMenu.vue

@@ -198,13 +198,22 @@ export default {
             {
             {
               id: 5,
               id: 5,
               path: '',
               path: '',
+              label: '公告管理',
+              icon: 'el-icon-s-promotion',
+              index: '/saas/announceManage',
+              children: [],
+            },
+
+            {
+              id: 6,
+              path: '',
               label: '国家代码',
               label: '国家代码',
               icon: 'el-icon-s-flag',
               icon: 'el-icon-s-flag',
               index: '/saas/countryCode',
               index: '/saas/countryCode',
               children: [],
               children: [],
             },
             },
             {
             {
-              id: 6,
+              id: 7,
               path: '',
               path: '',
               label: '州省简称',
               label: '州省简称',
               icon: 'el-icon-s-help',
               icon: 'el-icon-s-help',