From 85e36a5016633748bbd76bb4ddaef49566a505d5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 08 五月 2025 17:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java
index 63205ce..e7d1557 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java
@@ -4,12 +4,11 @@
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.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -48,6 +47,12 @@
@Excel(name = "鐖惰妭鐐圭紪鍙�", width = 15)
@ApiModelProperty(value = "鐖惰妭鐐圭紪鍙�")
private String parentId;
+ /**鐖惰妭鐐逛粨搴撶紪鍙�*/
+ @TableField(exist = false)
+ private String parentWarehouseId;
+ /**鐖惰妭鐐逛粨搴撳悕绉�*/
+ @TableField(exist = false)
+ private String parentWarehouseName;
/**灞曠ず搴忓彿*/
@Excel(name = "灞曠ず搴忓彿", width = 15)
@ApiModelProperty(value = "灞曠ず搴忓彿")
@@ -71,21 +76,21 @@
/**鍒涘缓浜�*/
@Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
- private String createdBy;
+ private String createBy;
/**鍒涘缓鏃堕棿*/
- @Excel(name = "鍒涘缓鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @Excel(name = "鍒涘缓鏃堕棿", width = 15, format = "yyyy-MM-dd HH:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createdTime;
+ private Date createTime;
/**鏇存柊浜�*/
@Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
- private String updatedBy;
+ private String updateBy;
/**鏇存柊鏃堕棿*/
- @Excel(name = "鏇存柊鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @Excel(name = "鏇存柊鏃堕棿", width = 15, format = "yyyy-MM-dd HH:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updatedTime;
+ private Date updateTime;
}
--
Gitblit v1.9.3