!6 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

Merge pull request !6 from hbzgyjh/auto-5488917-develop-1628504432702

src/App.vue

@@ -1,9 +1,25 @@
 <template>
   <div id="app">
+<<<<<<< HEAD
+    <el-button type="success">成功</el-button>
+    <hello-world></hello-world>
+=======
     <el-button type="success">成功按钮111</el-button>
+>>>>>>> 497212fe5a5e7e56b87cff7e44a9a2f9e6ff8857
   </div>
 </template>
 
+<script>
+import HelloWorld from '@/components/HelloWorld.vue'
+
+export default {
+  name: 'Home',
+  components: {
+    HelloWorld
+  }
+}
+</script>
+
 <style>
 #app {
   font-family: Avenir, Helvetica, Arial, sans-serif;