From c263633394b00cc13231f532257cef520c1b3bcb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Sep 2021 16:44:03 +0800
Subject: [PATCH] 解决冲突
---
src/page/login/codelogin.vue | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index 204be74..d359b6d 100644
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -132,7 +132,6 @@
dicr: [],
msgKey: false,
loginForm: {
- defaultFlag: false,
cardid: "",
username: "",
sname: "",
--
Gitblit v1.9.3