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

# Conflicts: # pages/personCenter/mine/mine.js
2025-06-03 09:09:05 +08:00 · 2025-06-03 09:09:05 +08:00 · d021c035d4
commit d021c035d4
parent 1a171a735d 0f2bd0a945
1 changed files with 3 additions and 2 deletions
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@ -7,8 +7,9 @@ Page({
   * 页面的初始数据
   */
  data: {
-    items: [null],
-    yt: "",
+    items: [null, null],
+    cxz: "",
+    hello: "",
    nickName: "",
    userAvatar: "",
    phoneNumber: "",