Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

# Conflicts:
#	pkg/common/db/model/group.go

pkg/common/db/cache/group.go

@@ -23,7 +23,7 @@ type GroupCache struct {
 
 func NewGroupCache(rdb redis.UniversalClient, db *mysql.Group, opts rockscache.Options) *GroupCache {
 	rcClient := &rockscache.Client{
-		Options: opts,
+		Options: rockscache.Options{},
 	}
 	redisClient := NewRedisClient(rdb)
 	return &GroupCache{rcClient: rcClient, expireTime: GroupExpireTime, db: db, redisClient: redisClient}