合并错误

4036988c · jiaxu.yan · 01fe074f · 4036988c
Commit 4036988c authored Dec 19, 2023 by jiaxu.yan
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

dialog.vue src/views/setting/rules/components/dialog.vue +0 -7

No files found.
--- a/src/views/setting/rules/components/dialog.vue
+++ b/src/views/setting/rules/components/dialog.vue
@@ -107,14 +107,7 @@ export default {
      this.$emit('close')
    },
    handleConfirm() {
-<<<<<<< HEAD
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-        }
-      })
-=======
      this.$refs['form'].validate(valid => {})
->>>>>>> develop
    }
  }
 }