From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug

---
 h5_standard/src/views/LogInAgain.vue |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/h5_standard/src/views/LogInAgain.vue b/h5_standard/src/views/LogInAgain.vue
index e597995..ba791b7 100644
--- a/h5_standard/src/views/LogInAgain.vue
+++ b/h5_standard/src/views/LogInAgain.vue
@@ -92,6 +92,9 @@
         code: '0000'
       })
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> dev
       // let res = await testLogin({ // 鏂囨
       //   username: '18656077929',
       //   password: '123456',

--
Gitblit v1.9.3