解决代码冲突

2023-11-14 17:57:33 +08:00
parent 3b2609e9a6
commit 12742d345f
231 changed files with 180 additions and 143121 deletions
--- a/src/views/system/dict/data/index.vue
+++ b/src/views/system/dict/data/index.vue
@ -6,10 +6,7 @@
      ref="queryFormRef"
      :inline="true"
      label-width="68px"
-<<<<<<< HEAD
-=======
      @submit.enter.prevent
->>>>>>> master
    >
      <el-form-item label="字典名称" prop="dictType">
        <el-select v-model="queryParams.dictType" class="!w-240px">