更新

package.json

@@ -30,7 +30,7 @@
     "qrcodejs2": "0.0.2",
     "simditor": "^2.3.26",
     "swiper": "^4.5.0",
-    "v-gantt-chart": "^1.3.7",
+    "v-gantt-chart": "^1.4.0",
     "v-jsoneditor": "^1.2.2",
     "vue": "2.6.10",
     "vue-fullcalendar": "^1.0.9",

src/views/virtualDevices/HMvehicleCreate.vue

@@ -171,10 +171,7 @@ export default {
     display flex
     justify-content center
     min-width 800px
-<<<<<<< HEAD
-=======
     min-height calc(100vh - 50px)
->>>>>>> 9f71214b7d50d1ae3b630a3f27eafe8ab27f211b
   .set-background >>> .el-form
     width 100%
     overflow auto