# Conflicts: # app.json # pages/personCenter/accountSetting/accountSetting.js # pages/personCenter/mine/mine.wxml |
||
---|---|---|
.. | ||
applyCode | ||
projectDetail | ||
projectList | ||
projectNotice | ||
promoPop | ||
settlement | ||
subSettlement | ||
userProject |
# Conflicts: # app.json # pages/personCenter/accountSetting/accountSetting.js # pages/personCenter/mine/mine.wxml |
||
---|---|---|
.. | ||
applyCode | ||
projectDetail | ||
projectList | ||
projectNotice | ||
promoPop | ||
settlement | ||
subSettlement | ||
userProject |