Merge remote-tracking branch 'origin/master'

jiangping

2024-12-25 9ae3baca4c8730fcc5f7c8daf3b6368cec554ae6

 screen/package-lock.json

@@ -18,7 +18,6 @@
        "uqrcodejs": "^4.0.7",
        "v-scale-screen": "^2.0.0",
        "vue": "^3.4.21",
        "vue-loading-overlay": "^6.0.6",
        "vue-router": "^4.3.0"
      },
      "devDependencies": {
@@ -3167,9 +3166,9 @@
      }
    },
    "node_modules/sass": {
      "version": "1.82.0",
      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.82.0.tgz",
      "integrity": "sha512-j4GMCTa8elGyN9A7x7bEglx0VgSpNUG4W4wNedQ33wSMdnkqQCT8HTwOaVSV4e6yQovcu/3Oc4coJP/l0xhL2Q==",
      "version": "1.83.0",
      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
      "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
      "dev": true,
      "dependencies": {
        "chokidar": "^4.0.0",
@@ -3718,17 +3717,6 @@
        "@vue/composition-api": {
          "optional": true
        }
      }
    },
    "node_modules/vue-loading-overlay": {
      "version": "6.0.6",
      "resolved": "https://registry.npmjs.org/vue-loading-overlay/-/vue-loading-overlay-6.0.6.tgz",
      "integrity": "sha512-ZPrWawjCoNKGbCG9z4nePgbs/K9KXPa1j1oAJXP6T8FQho3NO+/chhjx4MLYFzfpwr+xkiQ8SNrV1kUG1bZPAw==",
      "engines": {
        "node": ">=12.13.0"
      },
      "peerDependencies": {
        "vue": "^3.2.0"
      }
    },
    "node_modules/vue-router": {