Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-21 e0b0d19b4b95abed5cdb2e5e8933e07c369add62

 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>