Merge branch 'master' of http://192.168.0.105:10010/r/school-web

liuyg

2022-01-08 5e47738f99e307bab1c8a5ee9ecd96d8c7f4a968

 src/components/map/components/mapPopup.vue

@@ -263,7 +263,7 @@
            'teachList',
            // 科研
            'liveList',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag'
        ])
    },