Merge branch 'fix_bug_first_stage'

# Conflicts:
#	jero-web/src/components/CollectionType/index.vue
This commit is contained in:
lixuetao
2022-07-05 19:48:17 +08:00
15 changed files with 415 additions and 251 deletions
@@ -671,10 +671,6 @@
font-weight: bold;
}
.ant-table td {
white-space: nowrap;
}
.content-text {
width: 100%;
display: flex;