Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-05-31 f3aaa7ea7a0f56ff4a6f9faf057a6595ab3275a7

 ruoyi-ui/src/App.vue

@@ -1,11 +1,11 @@
<template>

  <div id="app">

    <router-view />

  </div>

</template>



<script>

export default  {

  name:  'App'

}

</script>

<template>
  <div id="app">
    <router-view />
  </div>
</template>

<script>
export default  {
  name:  'App'
}
</script>