From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
index 94e5eeb..ab81cc0 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
@@ -12,6 +12,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -85,12 +86,15 @@
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
- private Double quantity;
+ private BigDecimal quantity;
/**鍓╀綑鏁伴噺*/
@Excel(name = "鍓╀綑鏁伴噺", width = 15)
@ApiModelProperty(value = "鍓╀綑鏁伴噺")
- private Double remainingQuantity;
+ private BigDecimal remainingQuantity;
@TableField(exist = false)
@ApiModelProperty(value = "宸ュ崟鍙�")
private String workOrderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
}
--
Gitblit v1.9.3