From 64a86e8b0f864e8ea4783a6baa7a2e9413b50df6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 10:43:15 +0800
Subject: [PATCH] 解除大屏登陆拦截

---
 screen_standard/src/App.vue |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen_standard/src/App.vue b/screen_standard/src/App.vue
index 043ed5b..9799296 100644
--- a/screen_standard/src/App.vue
+++ b/screen_standard/src/App.vue
@@ -5,6 +5,10 @@
 
 <template>
   <AppLayout />
+<<<<<<< HEAD
+  
+=======
+>>>>>>> 5103535bcd7b012c0eda4cbb26968066b35704d1
 </template>
 
 <style scoped>

--
Gitblit v1.9.3