lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Yuanjianghong 2021-08-09 18:20:22 +08:00
parent dbf5f6678a 497212fe5a
commit 819ec095a6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.vue
View File

@ -1,7 +1,11 @@
<template> <template>
<div id="app"> <div id="app">
<<<<<<< HEAD
<el-button type="success">成功</el-button> <el-button type="success">成功</el-button>
<hello-world></hello-world> <hello-world></hello-world>
=======
<el-button type="success">成功按钮111</el-button>
>>>>>>> 497212fe5a5e7e56b87cff7e44a9a2f9e6ff8857
</div> </div>
</template> </template>