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:
wangchuxiao 2022-08-15 19:01:57 +08:00
parent 4ec255917d
commit d5b873b70b

View File

@ -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"