Merge remote-tracking branch 'origin/master'

jiangping

2024-06-12 78dd96d3db3ff54deda77611b5dfea33e40914a3

 admin/package.json

@@ -26,6 +26,7 @@
    "qrcodejs2": "0.0.2",
    "vue": "^2.6.11",
    "vue-clipboard2": "^0.3.1",
    "vue-cropper": "^0.6.5",
    "vue-json-viewer": "^2.2.22",
    "vue-router": "^3.5.1",
    "vuescroll": "^4.17.3",