package.json
@@ -1,8 +1,17 @@ { "dependencies": { <<<<<<< HEAD "@dcloudio/uni-ui": "^1.5.10", "crypto-js": "^4.2.0", "jsencrypt": "^3.3.2", ======= "@uqrcode/js": "^4.0.7", "crypto-js": "^4.2.0", "jsencrypt": "^3.3.2", "qrcode": "^1.5.4", "qrcode.vue": "^3.6.0", "uqrcodejs": "^4.0.7", >>>>>>> master "uview-ui": "^2.0.38" }, "devDependencies": {
