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/ApsMaterialStorageManagement.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java
index 5f2693d..7e247ae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.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;
@@ -26,7 +27,7 @@
/** 鏁伴噺 */
@Excel(name = "鏁伴噺")
- private Long num;
+ private BigDecimal num;
/** 閫傜敤宸ュ巶 */
@Excel(name = "閫傜敤宸ュ巶")
@@ -61,12 +62,12 @@
return itemNumber;
}
- public void setNum(Long num)
+ public void setNum(BigDecimal num)
{
this.num = num;
}
- public Long getNum()
+ public BigDecimal getNum()
{
return num;
}
--
Gitblit v1.9.3