Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

# Conflicts:
#	sight_harmony/wdComponent/src/main/ets/components/page/CardView.ets

+{
+  "name": "entry",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}

-{
-  "lockfileVersion": 1,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/hypium@1.0.11": "@ohos/hypium@1.0.11"
-  },
-  "packages": {
-    "@ohos/hypium@1.0.11": {
-      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.11.tgz",
-      "integrity": "sha512-KawcLnv43C3QIYv1UbDnKCFX3MohtDxGuFvzlUxT/qf2DBilR56Ws6zrj90LdH6PjloJQwOPESuBQIHBACAK7w=="
-    }
-  }
-}

-{
-  "lockfileVersion": 1,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/axios@^2.1.1": "@ohos/axios@2.1.1"
-  },
-  "packages": {
-    "@ohos/axios@2.1.1": {
-      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.1.1.har",
-      "integrity": "sha512-EQax257+eKKT0Rx7h6N6xvmKbDRWDjCCWOP2vyyktySFwvjtypXuXmQKEvRjmAalR6cqf8mbfhWmpg0bD9OQ3w=="
-    }
-  }
-}