Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # pages/personCenter/mine/mine.js
This commit is contained in:
commit
31a253227f
|
@ -8,7 +8,7 @@ Page({
|
|||
*/
|
||||
data: {
|
||||
items: [null, null],
|
||||
yt: "",
|
||||
cxz: "",
|
||||
nickName: "",
|
||||
userAvatar: "",
|
||||
phoneNumber: "",
|
||||
|
|
Loading…
Reference in New Issue
Block a user