Merge branch 'dev' into alpha
# Conflicts: # src/platforms/app-plus/service/api/device/system.js # src/platforms/h5/service/api/device/get-system-info.js # src/platforms/mp-weixin/helpers/enhance-system-info.js
Showing
想要评论请 注册 或 登录
# Conflicts: # src/platforms/app-plus/service/api/device/system.js # src/platforms/h5/service/api/device/get-system-info.js # src/platforms/mp-weixin/helpers/enhance-system-info.js