From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
index 08bfe24..0c6e1a0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fzzy.igds.constant.*;
import lombok.Data;
@@ -73,8 +74,8 @@
@TableField("food_level")
private String foodLevel;
- @Column(name = "food_locationId", columnDefinition = "varchar(40) COMMENT '绮浜у湴'")
- @TableField("food_locationId")
+ @Column(name = "food_location_id", columnDefinition = "varchar(40) COMMENT '绮浜у湴'")
+ @TableField("food_location_id")
private String foodLocationId;
@Column(name = "food_location", columnDefinition = "varchar(40) COMMENT '绮浜у湴'")
@@ -96,6 +97,18 @@
@Column(name = "bulk_weight", columnDefinition = "decimal(20,2) COMMENT '瀹归噸 g/L'")
@TableField("bulk_weight")
private Double bulkWeight;
+
+ @Column(name = "length", columnDefinition = "decimal(20,2) COMMENT '闀�/鐩村緞(鍗曚綅锛氱背)'")
+ @TableField("length")
+ private Double length = 0.0;
+
+ @Column(name = "width", columnDefinition = "decimal(20,2) COMMENT '瀹�(鍗曚綅锛氱背)'")
+ @TableField("width")
+ private Double width = 0.0;
+
+ @Column(name = "height", columnDefinition = "decimal(20,2) COMMENT '楂樺害(鍗曚綅锛氱背)'")
+ @TableField("height")
+ private Double height = 0.0;
@Column(name = "store_keeper", columnDefinition = "varchar(40) COMMENT '淇濈鍛�'")
@TableField("store_keeper")
@@ -123,27 +136,33 @@
@TableField("order_num")
private Integer orderNum = 1;
+ //璐ㄦ娂閾惰
+ @Column(name = "pledge_bank", columnDefinition = "varchar(40) COMMENT '璐ㄦ娂閾惰'")
+ @TableField("pledge_bank")
+ private String pledgeBank;
+
+
// ------------鍏朵粬灞炴�т俊鎭�------------//
@Transient
+ @TableField(exist = false)
private String foodVarietyName;
@Transient
+ @TableField(exist = false)
private String foodTypeName;
@Transient
+ @TableField(exist = false)
private String depotTypeName;
@Transient
+ @TableField(exist = false)
private String depotStatusName;
@Transient
+ @TableField(exist = false)
private String foodLevelName;
- @Transient
- private String storeKeeperLevel = "楂樼骇淇濈鍛�";
-
- @Transient
- private String storeKeeperPhone = "####";
public String getFoodLevelName() {
if (null != this.foodLevel) {
--
Gitblit v1.9.3