Merge remote-tracking branch 'origin/master'

doum

4 天以前 b6f401dd0a9d9bfb6c11c07cdcaab967eabb8af1

 small-program/.hbuilderx/launch.json

@@ -5,8 +5,12 @@
            "customPlaygroundType" : "device",
            "localRepoPath" : "D:/豆米/gtzxinglijicun/app/unpackage/dist/dev/app-plus",
            "packageName" : "com.doumee.mall",
            "playground" : "standard",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        },
        {
            "playground" : "standard",
            "type" : "uni-app:app-ios"
        }
    ]
}