mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-05-20 03:09:23 +08:00
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts: # pkg/common/db/mysql_model/im_mysql_model/ip_model.go
This commit is contained in:
parent
4ec255917d
commit
d5b873b70b
@ -1,7 +1,7 @@
|
|||||||
package register
|
package register
|
||||||
|
|
||||||
import (
|
import (
|
||||||
api "Open_IM/pkg/base_info"
|
//api "Open_IM/pkg/base_info"
|
||||||
"Open_IM/pkg/common/constant"
|
"Open_IM/pkg/common/constant"
|
||||||
"Open_IM/pkg/common/db"
|
"Open_IM/pkg/common/db"
|
||||||
imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
|
imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user