Merge refs/remotes/origin/master into refs/heads/master

yiming

2024-03-20 80232d691dd9c4989985b570ce4d745e5d2bc3f7

 pages/testLogin/index.js

@@ -77,7 +77,7 @@
        } else if (secretData) {
          defaultUser = {
            nickName: secretData.credential,
            avatarUrl: "../../static/images/index/tab.png",
            avatarUrl: "",
            userId: res.userId
          }
        }