From ab0b4b2397c46701e372a49cf8ff4d268bb577b3 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
index 4eb129e..91e81ae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 闆朵欢缁熻琛ㄥ璞� aps_part_route_stat
@@ -25,6 +26,8 @@
@Excel(name = "宸ュ崟鍙�")
private String workOrderNo;
+
+ private String resourceGroupName;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
private BigDecimal roadProcessNumber;
@@ -47,7 +50,7 @@
/** 璁″垝寮�宸ユ棩 */
@Excel(name = "璁″垝寮�宸ユ棩")
- private LocalDateTime processPlanStartDay;
+ private Date processPlanStartDay;
/** 璁捐宸ユ椂 */
@Excel(name = "璁捐宸ユ椂")
@@ -130,12 +133,12 @@
return processTotalTime;
}
- public void setProcessPlanStartDay(LocalDateTime processPlanStartDay)
+ public void setProcessPlanStartDay(Date processPlanStartDay)
{
this.processPlanStartDay = processPlanStartDay;
}
- public LocalDateTime getProcessPlanStartDay()
+ public Date getProcessPlanStartDay()
{
return processPlanStartDay;
}
@@ -170,6 +173,14 @@
return batchNumber;
}
+ public String getResourceGroupName() {
+ return resourceGroupName;
+ }
+
+ public void setResourceGroupName(String resourceGroupName) {
+ this.resourceGroupName = resourceGroupName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3