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

# Conflicts:
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
This commit is contained in:
yanyizhou
2021-09-09 14:21:44 +08:00
@@ -5074,6 +5074,7 @@ export default {
.el-card {
min-width: min-content;
}
height: 95%;
width: calc(~'100% - 15px');
position: absolute;
left: 0;