21 Commits

Author SHA1 Message Date
withchao
4bea4252ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:44:47 +08:00
withchao
26e130122c 1 2023-02-01 12:00:29 +08:00
wangchuxiao
4c931fba5c errcode 2023-01-31 18:55:22 +08:00
withchao
5c99bdf14f 1 2023-01-30 15:41:30 +08:00
withchao
4c6e02f805 1 2023-01-29 18:37:38 +08:00
withchao
b83260ca30 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 18:26:47 +08:00
withchao
0a81dd040f 1 2023-01-29 18:13:02 +08:00
wangchuxiao
d6edb4aa8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
2023-01-29 17:21:22 +08:00
wangchuxiao
704b18d900 errcode 2023-01-29 17:20:31 +08:00
withchao
cf4499e958 1 2023-01-29 15:23:14 +08:00
withchao
f65cd2aefc 1 2023-01-29 14:51:59 +08:00
wangchuxiao
52ceb7682d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/controller/group.go
	pkg/common/db/relation/group_member_model_k.go
2023-01-29 11:26:03 +08:00
withchao
4e10b361ed 1 2023-01-29 11:22:37 +08:00
wangchuxiao
945449108d errcode 2023-01-29 11:15:16 +08:00
wangchuxiao
5e4e960524 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
	pkg/common/db/relation/group_model_k.go
2023-01-29 10:37:59 +08:00
wangchuxiao
68d595b558 errcode 2023-01-29 10:31:01 +08:00
withchao
891e631b91 1 2023-01-28 18:01:33 +08:00
wangchuxiao
87e61046cb errcode 2023-01-28 17:09:20 +08:00
wangchuxiao
7fc279a329 errcode 2023-01-28 16:36:38 +08:00
wangchuxiao
870cc25beb errcode 2023-01-28 15:10:19 +08:00
wangchuxiao
d9becad8e9 errCode 2023-01-28 13:19:36 +08:00