From bf4f7bae745b8c6e9c468e243961c9edea6dfed4 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 09:13:09 +0800
Subject: [PATCH] fix: 进销存数据分析产品数去重
---
src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
index 7cdf48a..d71f206 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
@@ -1,13 +1,12 @@
package com.ruoyi.staff.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffLeave;
import lombok.Data;
-
-import java.util.Date;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StaffLeaveDto extends StaffLeave {
@Excel(name = "鐘舵��", readConverterExp = "0=绂昏亴,1=鍦ㄨ亴", sort = 1)
private Integer staffState;
@@ -95,4 +94,11 @@
*/
@Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 15)
private String emergencyContactPhone;
+
+ private int count;
+
+ /**
+ * 绂昏亴鍘熷洜鏂囨湰
+ */
+ private String reasonText;
}
--
Gitblit v1.9.3