From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
index d95a708..60d4545 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
@@ -12,6 +12,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -79,7 +80,7 @@
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
- private Double quantity;
+ private BigDecimal quantity;
/**鎶ュ伐浜�*/
@Excel(name = "鎶ュ伐浜�", width = 15)
@ApiModelProperty(value = "鎶ュ伐浜�")
@@ -113,5 +114,11 @@
@TableField(exist = false)
@ApiModelProperty(value = "浠撳簱鍚嶇О")
private String warehouseName;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浠撳簱缂栫爜")
+ private String warehouseCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鎶ュ伐绫诲瀷(鎴愬搧FINISHED銆佸崐鎴愬搧HALF)")
+ private String reportType;
}
--
Gitblit v1.9.3