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

7e47cc02 · fxy060608 · 7383b7cb · 3bd59a80 · 7e47cc02 · 7e47cc02
2 changed file
--- a/packages/uni-app-plus/template/common/__uniapppicker.js
+++ b/packages/uni-app-plus/template/common/__uniapppicker.js
--- a/packages/uni-cli-shared/template/common/__uniapppicker.js
+++ b/packages/uni-cli-shared/template/common/__uniapppicker.js