Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
This commit is contained in:
commit
e402029f6c
|
|
@ -144,7 +144,7 @@ public class SalarySobItemAggregateBO {
|
||||||
.canEdit(openFormulaForcedEditing || Objects.equals(salaryItemPO.getCanEdit(), 1))
|
.canEdit(openFormulaForcedEditing || Objects.equals(salaryItemPO.getCanEdit(), 1))
|
||||||
.canDelete(openFormulaForcedEditing || salaryItemPO.getCanDelete() == null || Objects.equals(salaryItemPO.getCanDelete(), 1))
|
.canDelete(openFormulaForcedEditing || salaryItemPO.getCanDelete() == null || Objects.equals(salaryItemPO.getCanDelete(), 1))
|
||||||
.width(salaryItemPO.getWidth())
|
.width(salaryItemPO.getWidth())
|
||||||
.defaultValue(salaryItemPO.getDefaultValue())
|
.defaultValue(salarySobItemPO.getDefaultValue())
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue