Merge branch 'master' into dev-v1.1

wupengfei

昨天 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305

1
2
3
4
5
6
7
8
9
{
  "miniprogramRoot": "./",
  "projectname": "bMiniApp",
  "appid": "testAppId",
  "setting": {
    "es6": false,
    "minified": false
  }
}