Merge branch 'chenxinzhi'

# Conflicts: # pages/personCenter/mine/mine.js
2025-05-31 12:32:01 +08:00 · 2025-05-31 12:32:01 +08:00 · 626129adb3
commit 626129adb3
parent fc47944f4c cc3056bf67
1 changed files with 2 additions and 1 deletions
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@ -8,7 +8,8 @@ Page({
   */
  data: {
    items: [null, null, null],
-    mst: "",
+    cxz: "",
+    hello: '',
    nickName: "",
    userAvatar: "",
    phoneNumber: "",