修改版本

package-lock.json

@@ -7304,15 +7304,9 @@
       }
     },
     "pc-client-component": {
-<<<<<<< HEAD
       "version": "0.0.44",
       "resolved": "https://registry.npmmirror.com/pc-client-component/download/pc-client-component-0.0.44.tgz",
       "integrity": "sha1-raCza8THZARuETb6wntaB9WglJE="
-=======
-      "version": "0.0.38",
-      "resolved": "https://registry.npmmirror.com/pc-client-component/download/pc-client-component-0.0.38.tgz?cache=0&sync_timestamp=1633673056826&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpc-client-component%2Fdownload%2Fpc-client-component-0.0.38.tgz",
-      "integrity": "sha1-7i6Cmv4UHj0SuY986bnjXu6M7x0="
->>>>>>> 35b7b9982e817b03b6f2dd7f3e3414c646e35226
     },
     "picomatch": {
       "version": "2.3.0",