Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

package-lock.json

@@ -13613,6 +13613,8 @@
         }
       }
     },
+<<<<<<< HEAD
+=======
     "@vue/vue-loader-v15": {
       "version": "npm:vue-loader@15.11.1",
       "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
@@ -13634,6 +13636,7 @@
         }
       }
     },
+>>>>>>> 95ade57cb437050dbbaeafd9b139c75ff59857d7
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",