Merge remote-tracking branch 'origin/master'

doum

6 天以前 9d048336c720f3ceda8aac29f606c6f8e6079b96

 app/.hbuilderx/launch.json

@@ -2,10 +2,10 @@
    "version" : "1.0",
    "configurations" : [
        {
            "customPlaygroundType" : "device",
            "customPlaygroundType" : "local",
            "localRepoPath" : "D:/豆米/gtzxinglijicun/app",
            "packageName" : "com.doumee.mall",
            "playground" : "standard",
            "packageName" : "com.doumee.app",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        },
        {