Merge branch 'dev_20231201_feizhi' of http://git.hzwlsoft.com/laws-foton-slrs/foton-laws-system-front into dev_20231201_feizhi

This commit is contained in:
zhoulingpo
2023-12-13 10:43:26 +08:00
@@ -25,7 +25,7 @@
:height="tablePHeight"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
style="width: 10%;float: left;margin-right: 20px;">
style="width: calc(10% - 20px);float: left;margin-right: 20px;">
<el-table-column
prop="userName"
align="center"