Merge branch 'master' into dev-1.1.2

wupengfei

6 小时以前 4ef86d8a1f494caa1e136ff78f9ea258d01164b1

 apps/cMiniApp/project.config.json

@@ -37,7 +37,11 @@
        "showES6CompileOption": false,
        "useCompilerPlugins": false,
        "ignoreUploadUnusedFiles": true,
        "condition": false
        "condition": false,
        "compileWorklet": false,
        "localPlugins": false,
        "swc": false,
        "disableSWC": true
    },
    "compileType": "miniprogram",
    "editorSetting": {
@@ -46,10 +50,11 @@
    },
    "srcMiniprogramRoot": "dist/",
    "condition": {},
    "libVersion": "3.1.0",
    "libVersion": "3.10.0",
    "packOptions": {
        "ignore": [],
        "include": []
    },
    "appid": "wxb9e0baf4f87aa0de"
    "appid": "wxb9e0baf4f87aa0de",
    "simulatorPluginLibVersion": {}
}