From 480af1ab454d6c13bc94a5ec4919095dd4b880b0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 16 四月 2025 17:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java
index d828866..8ab9545 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java
@@ -1,6 +1,8 @@
package com.aps.core.domain;
import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -97,15 +99,17 @@
@Excel(name = "鎬荤剨缂�")
private Long totalWeldSeam;
-
-
-
-
-
-
/** 宸ュ巶 */
// @Excel(name = "宸ュ巶")
private String plant;
+
+ /** 缁熻鐢熶骇骞翠唤 */
+ @Excel(name = "鐢熶骇骞翠唤List")
+ private List<Long> produceYears;
+
+ /** 缁熻鐢熶骇鏈堜唤 */
+ @Excel(name = "鐢熶骇鏈堜唤List")
+ private List<Long> produceMonths;
public void setId(String id)
{
@@ -317,6 +321,26 @@
return plant;
}
+ public void setProduceYears(List<Long> produceYears)
+ {
+ this.produceYears = produceYears;
+ }
+
+ public List<Long> getProduceYears()
+ {
+ return produceYears;
+ }
+
+ public void setProduceMonths(List<Long> produceMonths)
+ {
+ this.produceMonths = produceMonths;
+ }
+
+ public List<Long> getProduceMonths()
+ {
+ return produceMonths;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3