merge conflicts for v4.0.5

This commit is contained in:
RockYang
2024-05-21 11:30:40 +08:00
181 changed files with 5241 additions and 1437 deletions

View File

@@ -350,13 +350,14 @@ const remove = function (row) {
@import "@/assets/css/admin/form.styl";
.model-list {
.opt-box {
padding-bottom: 10px;
display: flex;
justify-content flex-end
.handle-box {
margin-bottom 20px
}
.el-icon {
margin-right: 5px;
.cell {
.copy-model {
margin-left 6px
cursor pointer
}
}
@@ -371,5 +372,11 @@ const remove = function (row) {
width: 100%
}
.pagination {
padding 20px 0
display flex
justify-content right
}
}
</style>