feat: merge v3dev into main

2023-07-12 15:12:23 +08:00
parent e000236eca 2e6ea7b193
commit 524f63ab35
123 changed files with 7377 additions and 10288 deletions
@@ -54,7 +54,7 @@ message updateUserInfoResp{

 message setGlobalRecvMessageOptReq{
  string userID = 1;
-  int32 globalRecvMsgOpt = 3;
+ int32 globalRecvMsgOpt = 3;
 }
 message setGlobalRecvMessageOptResp{
 }
@@ -155,7 +155,8 @@ message userRegisterCountReq {

 message userRegisterCountResp {
  int64 total = 1;
-  map<string, int64> count = 2;
+  int64 before = 2;
+  map<string, int64> count = 3;
 }

 service user {