diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java index e0da23f5a..abd136338 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java @@ -138,8 +138,10 @@ public class MesUnitpriceReport extends BaseEntity { // @Excel(name = "平均工资") // private String avgResult; - @Excel(name = "工时工资") + @Excel(name = "时薪") private String realWages; + @Excel(name = "备注", readConverterExp = "1=请假") + private String remark; /** * 子工序编码 @@ -152,7 +154,6 @@ public class MesUnitpriceReport extends BaseEntity { * $column.columnComment */ - public BigDecimal getKk() { return kk; }