From af5463a094ae2818bf6de206118447a1a99b67c1 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 20 五月 2025 18:04:54 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java | 28 ----------------------------
1 files changed, 0 insertions(+), 28 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 8ab9545..e32a1ab 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,7 +1,6 @@
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;
@@ -102,14 +101,6 @@
/** 宸ュ巶 */
// @Excel(name = "宸ュ巶")
private String plant;
-
- /** 缁熻鐢熶骇骞翠唤 */
- @Excel(name = "鐢熶骇骞翠唤List")
- private List<Long> produceYears;
-
- /** 缁熻鐢熶骇鏈堜唤 */
- @Excel(name = "鐢熶骇鏈堜唤List")
- private List<Long> produceMonths;
public void setId(String id)
{
@@ -321,25 +312,6 @@
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() {
--
Gitblit v1.9.3