From e0b0d19b4b95abed5cdb2e5e8933e07c369add62 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 10:04:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
screen_standard/src/App.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen_standard/src/App.vue b/screen_standard/src/App.vue
index 5bfbf1c..9799296 100644
--- a/screen_standard/src/App.vue
+++ b/screen_standard/src/App.vue
@@ -1,10 +1,14 @@
<script setup>
-import { RouterLink, RouterView } from 'vue-router'
+
import AppLayout from './components/AppLayout.vue'
</script>
<template>
<AppLayout />
+<<<<<<< HEAD
+
+=======
+>>>>>>> 5103535bcd7b012c0eda4cbb26968066b35704d1
</template>
<style scoped>
--
Gitblit v1.9.3