Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-04-24 3d15a9931bba33b1e447f621795106008361956f

 ruoyi-ui/src/router/index.js

@@ -179,6 +179,23 @@
      }
    ]
  },
  //收藏和荣誉
  {
    path: '/familymodel/Collection',
    component: Layout,
    // permissions: [],
    hidden: true,
    permissions: ['familymodel:collection:info'],

    children: [
      {
        path: 'collectionInfo/:id(\\d+)',
        component: () => import('@/views/collection/collectionInfo'),
        name: 'collectionInfo',
        meta: { title: '收藏与荣誉查询详情',activeMenu: '/familymodel/zfCollection'}
      }
    ]
  },
  //家庭小医生
  {
    path: '/familymodel/Doctor',