代码提交

2023-11-14 17:34:21 +08:00
parent 1f23efbb86
commit 3b2609e9a6
244 changed files with 175356 additions and 31282 deletions
--- a/src/views/system/dict/data/index.vue
+++ b/src/views/system/dict/data/index.vue
@ -6,6 +6,10 @@
      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">