From a6dd30e8bfffa5057e929cf355fbfdb860e70d2c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 20 五月 2025 13:47:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
index 5947093..836371a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -36,14 +34,22 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭id")
private String id;
- /**宸ュ叿缂栫爜*/
+ /**宸ュ叿缂栫爜(鍏宠仈瀛楁)*/
@Excel(name = "宸ュ叿缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ュ叿缂栫爜")
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(鍏宠仈瀛楁,瀛榯ms_base_tools琛ㄤ富閿甶d)")
private String toolCode;
+ /**宸ュ叿缂栫爜*/
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(tms_base_tools琛╰ool_code瀛楁)")
+ @TableField(exist = false)
+ private String toolNum;
/**宸ュ叿缂栧彿*/
@Excel(name = "宸ュ叿缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
+ /**宸ュ叿涓枃鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ叿涓枃鍚嶇О")
+ private String toolName;
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
@@ -56,6 +62,10 @@
@Excel(name = "搴撳尯/搴撳彿", width = 15)
@ApiModelProperty(value = "搴撳尯/搴撳彿")
private String warehouseId;
+ /**浠撳簱鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
/**搴撲綅鍙�*/
@Excel(name = "搴撲綅鍙�", width = 15)
@ApiModelProperty(value = "搴撲綅鍙�")
--
Gitblit v1.9.3