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

gaoluyang

昨天 94b7cc1f950e68c96d6a4510629d903d4706ca27

 src/manifest.json

@@ -23,8 +23,7 @@
        /* 模块配置 */
        "modules" : {
            "Camera" : {},
            "Barcode" : {},
            "Push" : {}
            "Barcode" : {}
        },
        /* 应用发布信息 */
        "distribute" : {