Merge branch 'dev' of github.com:dcloudio/uni-app into dev

1ac62092 · qiang · 68580f1b · 1e730df9 · 1ac62092 · 1ac62092
2 changed file
--- a/packages/uni-app-plus/template/common/__uniappopenlocation.js
+++ b/packages/uni-app-plus/template/common/__uniappopenlocation.js
--- a/packages/uni-app-plus/template/common/__uniapppicker.js
+++ b/packages/uni-app-plus/template/common/__uniapppicker.js