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

yiming

2024-03-26 09905b43ec2a249ef0e6057d148b8620cfaa1506

 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
          }
        }