Merge remote-tracking branch 'origin/master'

doum

17 小时以前 b902b40fda2f1dccca0825277d07908119deecfd

 mini-program/package.json

@@ -15,6 +15,7 @@
        ]
    },
    "dependencies": {
        "qrcode": "^1.5.4",
        "uview-ui": "^2.0.38"
    }
}