From 66635aefcff1aa3d9e6cd6210773752414184f14 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 21 四月 2025 17:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
index 8edb675..e97a48c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
@@ -1,5 +1,6 @@
package com.aps.core.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -50,7 +51,7 @@
/** 鏈�鏃╁彲鎻愬墠鐢熶骇澶╂暟 */
@Excel(name = "鏈�鏃╁彲鎻愬墠鐢熶骇澶╂暟")
- private String advanceProductionDays;
+ private BigDecimal advanceProductionDays;
/** 鎷嗗垎鎵归噺 */
@Excel(name = "鎷嗗垎鎵归噺")
@@ -163,12 +164,12 @@
return versionNumber;
}
- public void setAdvanceProductionDays(String advanceProductionDays)
+ public void setAdvanceProductionDays(BigDecimal advanceProductionDays)
{
this.advanceProductionDays = advanceProductionDays;
}
- public String getAdvanceProductionDays()
+ public BigDecimal getAdvanceProductionDays()
{
return advanceProductionDays;
}
--
Gitblit v1.9.3