From 6c71d5503f728d9ddafe09205fe3d8de9d0a303d Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Thu, 5 Jun 2025 16:38:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/pay/domain/vo/PaySalaryReportVo.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java
index bcf6037..99221d1 100644
--- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java
+++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PaySalaryReportVo.java
@@ -5,7 +5,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 
@@ -18,20 +21,20 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class PaySalaryReportVo {
+public class PaySalaryReportVo  {
 
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键
      */
-    @ExcelProperty(value = "主键")
+   // @ExcelProperty(value = "主键")
     private Long id;
 
     /**
      * 租户id
      */
-    @ExcelProperty(value = "租户id")
+   // @ExcelProperty(value = "租户id")
     private Long tenantId;
 
     /**
@@ -49,7 +52,7 @@ public class PaySalaryReportVo {
     /**
      * 部门id
      */
-    @ExcelProperty(value = "部门id")
+   // @ExcelProperty(value = "部门id")
     private Long deptId;
 
     /**
@@ -61,7 +64,7 @@ public class PaySalaryReportVo {
     /**
      * 员工id
      */
-    @ExcelProperty(value = "员工id")
+   // @ExcelProperty(value = "员工id")
     private Long employeeId;
 
     /**