Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # pages/personCenter/mine/mine.js
2025-06-03 09:15:43 +08:00 · 2025-06-03 09:15:43 +08:00 · 95bede1c28
commit 95bede1c28
parent f7f43d8686 76140ab79e
1 changed files with 1 additions and 2 deletions
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@ -8,8 +8,7 @@ Page({
   */
  data: {
    items: [null],
-    cxz1: "",
-    hello1: "",
+    cxz: "",
    nickName: "",
    userAvatar: "",
    phoneNumber: "",