From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突

---
 src/views/securityGuard/securityGuardRegistration.vue |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/views/securityGuard/securityGuardRegistration.vue b/src/views/securityGuard/securityGuardRegistration.vue
index 9029dff..2376840 100644
--- a/src/views/securityGuard/securityGuardRegistration.vue
+++ b/src/views/securityGuard/securityGuardRegistration.vue
@@ -305,6 +305,8 @@
                 label: "用户生日",
                 type: "date",
                 prop: "birthday",
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd",
               },
             ],
           },

--
Gitblit v1.9.3