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

# Conflicts: # pages/personCenter/mine/mine.js
2025-06-03 08:56:48 +08:00 · 2025-06-03 08:56:48 +08:00 · 92aab2ab7b
commit 92aab2ab7b
parent 6323bfc11b 024b796d0a
1 changed files with 2 additions and 2 deletions
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@ -7,8 +7,8 @@ Page({
   * 页面的初始数据
   */
  data: {
-    items: [null],
+    items: [null, null],
-    yt: "",
+    cxz: "",
    nickName: "",
    userAvatar: "",
    phoneNumber: "",