Commit 002a762d authored by IvyXia123's avatar IvyXia123

Merge branch 'dev' into pre

parents 84215b5e e67734e6
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
:total="total" style="text-align: center;"> :total="total" style="text-align: center;">
</el-pagination> </el-pagination>
</div> </div>
</el-dialog> </el-dialog>
</el-card> </el-card>
</div> </div>
......
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