From 000205578dc02b9d9ac0e2e5dee740142f4cff80 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 10:36:30 +0800
Subject: [PATCH] fix: 销售发货单打印有多个产品时只展示一个产品名称
---
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 0efe755..1b05f60 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -7,8 +7,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -19,7 +21,8 @@
@Data
@TableName("labor_issue")
@ApiModel
-public class LaborIssue extends StartAndEndDateDto {
+@EqualsAndHashCode(callSuper = true)
+public class LaborIssue extends StartAndEndDateDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -106,15 +109,6 @@
private Long num;
/**
- * 棰嗙敤鏃ユ湡
- */
- @ApiModelProperty("棰嗙敤鏃ユ湡")
- @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date adoptedDate;
-
- /**
* 杩涘巶鏃ユ湡
*/
@ApiModelProperty("杩涘巶鏃ユ湡")
@@ -133,6 +127,15 @@
private Date issueDate;
/**
+ * 棰嗙敤鏃ユ湡
+ */
+ @ApiModelProperty("棰嗙敤鏃ユ湡")
+ @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date adoptedDate;
+
+ /**
* 绛惧悕
*/
@Excel(name = "绛惧悕")
--
Gitblit v1.9.3