Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 manifest.json

@@ -192,7 +192,7 @@
    "mp-weixin" : {
        /* 小程序特有相关 */
        "usingComponents" : true,
        "appid" : "wx68b8b82ae4ebc63a",
        "appid" : "wxc95bf8fcd206c2cb",
        "optimization" : {
            "subPackages" : true
        },