From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
index 9724b77..69abacf 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialOutbound.java
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -66,6 +67,7 @@
/**浜х嚎ID*/
@Excel(name = "浜х嚎ID", width = 15)
@ApiModelProperty(value = "浜х嚎ID")
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
private String factoryId;
/**鎵规鍙�*/
@Excel(name = "鎵规鍙�", width = 15)
@@ -84,7 +86,7 @@
/**鍑哄簱鏁伴噺*/
@Excel(name = "鍑哄簱鏁伴噺", width = 15)
@ApiModelProperty(value = "鍑哄簱鏁伴噺")
- private String quantity;
+ private Double quantity;
/**宸ュ崟ID*/
@Excel(name = "宸ュ崟ID", width = 15)
@ApiModelProperty(value = "宸ュ崟ID")
--
Gitblit v1.9.3