Merge branch 'dev-patients-20190513' into release-0612

# Conflicts:
#	src/views/layout/slidebar.vue

src/router/router.js

@@ -10,6 +10,8 @@ const createComponent = r => require.ensure([], () => r(require('../views/educat
 const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role')
 const addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager')
 const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
+const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
+
 
 import patientsRouters from './patients'
 
@@ -55,6 +57,17 @@ export default [{
             path: '/item-role',
             component: itemRole
         },
+      {
+        path: '/msg-push',
+        component: msgPush,
+        // redirect: 'msgpush/msg-push',
+      },
+      // {
+      //   path: '/followup',
+      //   name: 'followUp',
+      //   component: followUp,
+      //   redirect: 'followup/plan-manage/planList',
+      // },
         followRouters,
         patientsRouters,
     ]

src/views/msgpush/msg-push.vue

+<template>
+    <div>
+
+    </div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style scoped lang="scss">
+
+</style>