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; /**