Merge remote-tracking branch 'origin/basic' into basic

# Conflicts:
#	src/components/table/advance/SearchArea.vue
This commit is contained in:
chenghongxing 2020-10-05 17:12:26 +08:00
commit 2c9b86e0e5

View File

@ -151,7 +151,7 @@ export default {
} }
.admin-layout-content{ .admin-layout-content{
padding: 24px 24px 0; padding: 24px 24px 0;
overflow-x: hidden; /*overflow-x: hidden;*/
min-height: calc(100vh - 64px - 122px); min-height: calc(100vh - 64px - 122px);
} }
.setting{ .setting{