Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

昨天 b64a0deae5b5d33f9e20671a68936b27f0b9b00b

 src/views/im/utils/user.ts

@@ -11,8 +11,8 @@

import type { Conversation, Friend, Group, User } from '../home/types'

import { CommonStatusEnum } from '../../../packages/constants/src'
import { useUserStore } from '../../../packages/stores/src'
import { CommonStatusEnum } from '#/packages/constants/src'
import { useUserStore } from '#/packages/stores/src'

import { getCurrentUserId } from '#/views/im/utils/auth'