处理冲突

dc609596 · 高超凡 · be217dd0 · dc609596
Commit dc609596 authored May 07, 2021 by 高超凡
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

add-or-update.vue src/pages/sys/point/add-or-update.vue +0 -4

No files found.
--- a/src/pages/sys/point/add-or-update.vue
+++ b/src/pages/sys/point/add-or-update.vue
@@ -344,11 +344,7 @@ export default {
        if (this.dataForm.modeTypes) {
          console.log('111111:')
          this.dataForm.modeTypes = this.dataForm.modeTypes.split(',')
-<<<<<<< HEAD
        }else{
-=======
-        } else {
->>>>>>> 2a58c42b0dae356732e508a0f239c221df0d9952
          this.dataForm.modeTypes = []
        }
      }