From 24bee1a669c3f01f4c3ce7c6f4f4e2e37fe3dfe2 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 10 一月 2026 08:34:40 +0800
Subject: [PATCH] #application-dev
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
index ba4840f..53effe8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
@@ -4,6 +4,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +25,7 @@
@Data
@TableName("man_warehouse")
+@Accessors(chain = true)
@ApiModel(value = "Warehouse", description = "浠撳簱鍩虹淇℃伅")
public class Warehouse implements Serializable {
@@ -58,35 +62,35 @@
@ApiModelProperty(value= "浠撳簱鍦板潃")
private String address;
- /**
- * 缁忓害
- */
- @ApiModelProperty(value= "缁忓害")
- private String longitude;
-
- /**
- * 绾害
- */
- @ApiModelProperty(value= "绾害")
- private String latgitude;
-
- /**
- * 闀�
- */
- @ApiModelProperty(value= "闀�")
- private Double length;
-
- /**
- * 瀹�
- */
- @ApiModelProperty(value= "瀹�")
- private Double width;
-
- /**
- * 楂�
- */
- @ApiModelProperty(value= "楂�")
- private Double height;
+// /**
+// * 缁忓害
+// */
+// @ApiModelProperty(value= "缁忓害")
+// private String longitude;
+//
+// /**
+// * 绾害
+// */
+// @ApiModelProperty(value= "绾害")
+// private String latgitude;
+//
+// /**
+// * 闀�
+// */
+// @ApiModelProperty(value= "闀�")
+// private Double length;
+//
+// /**
+// * 瀹�
+// */
+// @ApiModelProperty(value= "瀹�")
+// private Double width;
+//
+// /**
+// * 楂�
+// */
+// @ApiModelProperty(value= "楂�")
+// private Double height;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -118,6 +122,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;
/**
@@ -131,6 +136,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;
/**
@@ -150,6 +156,9 @@
@TableField(exist = false)
private Integer flagWare;
+ @TableField(exist = false)
+ @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+ private Long index;
public Warehouse() {}
@@ -158,11 +167,11 @@
this.code = code;
this.factory = factory;
this.address = address;
- this.longitude = longitude;
- this.latgitude = latgitude;
- this.length = length;
- this.width = width;
- this.height = height;
+// this.longitude = longitude;
+// this.latgitude = latgitude;
+// this.length = length;
+// this.width = width;
+// this.height = height;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
--
Gitblit v1.9.1