From ee22e4cdf5656272443365aa54bf08863f7fae52 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 17 七月 2024 13:47:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java b/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java
index e247f70..04702b3 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java
@@ -26,6 +26,7 @@
     @ExcelProperty(value = "1鏃�")
     private Double oneHours;
 
+    @ExcelIgnore
     private Integer one;
 
     @ApiModelProperty("2鏃ュ伐鏃�")

--
Gitblit v1.9.3