Merge remote-tracking branch 'origin/master'

doum

昨天 08300102d46271dd34073465763debd8507e8552

 mini-program/package.json

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