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/LswMaterialInventory.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
index ff35baa..2c8c6b7 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -1,16 +1,20 @@
package org.jeecg.modules.lsw.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.persistence.Table;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -59,11 +63,15 @@
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
- private String quantity;
+ private BigDecimal quantity;
/**搴撳瓨鍦癐D*/
@Excel(name = "搴撳瓨鍦癐D", width = 15)
+ @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
@ApiModelProperty(value = "搴撳瓨鍦癐D")
private String warehouseId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴撳瓨鍦�")
+ private String warehouseName;
/**搴撳瓨鐘舵��*/
@Excel(name = "搴撳瓨鐘舵��", width = 15)
@ApiModelProperty(value = "搴撳瓨鐘舵��")
--
Gitblit v1.9.3