From d87b636f92269b4ec97cb5ca00680409755814a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:43 +0800
Subject: [PATCH] 收货优化修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 118af79..2a73fed 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;
@@ -51,20 +52,20 @@
/**
* 瀹瑰櫒绫诲瀷鏍囪瘑
*/
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷鏍囪瘑")
- private Long typeId;
+ @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+ private Long type;
/**
* 浣跨敤娆℃暟
*/
@ApiModelProperty(value= "浣跨敤娆℃暟")
- private Double used;
+ private Integer used;
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double lenght;
+ private Double length;
/**
* 瀹藉害
@@ -157,6 +158,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 +172,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;
/**
@@ -180,12 +183,12 @@
public Container() {}
- public Container(String code,String name,Long typeId,Double used,Double lenght,Double width,Double height,Double rstLen,Double rstWid,Double rstWei,Double rstHei,Long panrentId,Date vaildTime,Short flagRycle,Short flagLogic,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Container(String code,String name,Long typeId,Integer used,Double lenght,Double width,Double height,Double rstLen,Double rstWid,Double rstWei,Double rstHei,Long panrentId,Date vaildTime,Short flagRycle,Short flagLogic,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
this.name = name;
- this.typeId = typeId;
+ 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