Merge remote-tracking branch 'origin/master'

doum

8 天以前 b7d451c91ec40bee70f23b1e2cf6a8797643faef

 app/.hbuilderx/launch.json

@@ -3,6 +3,8 @@
    "configurations" : [
        {
            "customPlaygroundType" : "device",
            "localRepoPath" : "D:/豆米/gtzxinglijicun/app",
            "packageName" : "com.doumee.mall",
            "playground" : "standard",
            "type" : "uni-app:app-android"
        }