Commit 14a8263c authored by 曹洋's avatar 曹洋

Merge branch 'dev' into 'master'

合并测试

See merge request !2
parents a8aee09f c40ad8fd
......@@ -38,6 +38,8 @@
</div>
<div class="bottomInfo">
<img src="@/assets/img/bottomInfo.png" alt="">
</div>
</div>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment