Merge branch 'tuoyun' into superGroup

Browse Source

# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto

...

This commit is contained in:

wangchuxiao

2022-06-07 17:42:24 +08:00

parent 2b150e3c1c 269df23851

commit 5f42748e1b

78 changed files with 1214 additions and 418 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pkg/proto/group/group.pb.go

+388 -212

File diff suppressed because it is too large Load Diff