From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:07:35 +0800
Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
index dc78784..ab7371d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
@@ -2,17 +2,17 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,6 +39,7 @@
/**
* 缂栫爜
*/
+ @TableField(exist = false)
@ApiModelProperty(value= "缂栫爜")
private String code;
@@ -64,7 +65,7 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double lenght;
+ private Double length;
/**
* 瀹藉害
@@ -137,7 +138,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -157,6 +157,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -170,6 +171,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -185,7 +187,7 @@
this.name = name;
this.type = typeId;
this.used = used;
- this.lenght = lenght;
+ this.length = lenght;
this.width = width;
this.height = height;
this.rstLen = rstLen;
--
Gitblit v1.9.1