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

# Conflicts:
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
高嵩
2023-02-14 14:08:42 +08:00
2 changed files with 18 additions and 20 deletions
@@ -1996,9 +1996,9 @@ popconfirmmize {
//font-weight: bold;
//background: #f3f6f6;
//}
.ant-table-row-cell-ellipsis{
padding: 0!important;
}
//.ant-table-row-cell-ellipsis{
// padding: 0!important;
//}
.second{
padding: 0!important;
}
@@ -3190,23 +3190,21 @@ popconfirmmize {
width: 100% !important;
}
//.customizetable .ant-table-thead > tr > th {
// height: 46px !important;
//padding: 8px 8px !important;
//font-weight: bold;
//background: #f3f6f6;
//}
.ant-table-row-cell-ellipsis {
padding: 0 !important;
}
.second {
padding: 0 !important;
}
//.tableList .ant-table-tbody > tr > td{
// color: #040B29 ;
//}
//.customizetable .ant-table-thead > tr > th {
// height: 46px !important;
//padding: 8px 8px !important;
//font-weight: bold;
//background: #f3f6f6;
//}
//.ant-table-row-cell-ellipsis{
// padding: 0!important;
//}
.second{
padding: 0!important;
}
//.tableList .ant-table-tbody > tr > td{
// color: #040B29 ;
//}
//.tableList .ant-table-thead > tr{
// padding: 2px 16px !important;