Merge branch 'master' of http://192.168.0.3:3000/ShangHaiLeanwoNodeJs/client-trace

package-lock.json

@@ -7304,9 +7304,15 @@
       }
     },
     "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",

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app" style="padding: 10px">
+  <div id="app">
     <router-view/>
   </div>
 </template>