From ef62e19fb0c0f5e1fe0e091552c994fe3e0fc29e Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 9 Aug 2024 18:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/mes/domain/MesUnitpriceReport.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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;
     }