Merge branch 'master' of http://192.168.1.220:10080/raolu/video-chat

# Conflicts:
#	src/Main.vue
#	src/components/messagePage.vue

src/assets/js/apis/api-im.js

@@ -141,7 +141,7 @@ export default {
        // 获取与医生相关的会话，实际上这些是P2P，群聊和讨论组
        getSessionsWithDoctor(userId, page, size) {
            return http.imget(ENDPOINTS.Sessions.Sessions,
                { user_id: userId, business_type: '1', page: page, size: size })
                { user_id: userId, business_type: '1', page: page, size: size ,videoconferencing:1})
        },
        // 获取最近7天内的会话列表
        getRecentSessions(userId) {