From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 36db1be..7dea595 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -29,10 +29,12 @@
 
     @ApiModelProperty(value= "浜у搧缂栫爜")
     @TableId(value = "mat_no", type = IdType.INPUT)
+    @TableField("mat_no")
     private String matNo;
 
     @ApiModelProperty(value= "浜у搧鍚嶇О")
     @TableId(value = "mat_name")
+    @TableField("mat_name")
     private String matName;
 
     @ApiModelProperty(value= "瑙勬牸")
@@ -87,6 +89,32 @@
     @TableField("appe_time")
     private Date appeTime;
 
+    /**
+     * 鎬绘暟閲�
+     */
+    @ApiModelProperty(value= "鎬绘暟閲�")
+    @TableField("all_qty")
+    private Double allQty;
+
+    /**
+     * 鎬婚噸
+     */
+    @ApiModelProperty(value= "鎬婚噸閲�")
+    @TableField("all_weight")
+    private Double allWeight;
+
+    @ApiModelProperty(value= "鏉ユ簮")
+    @TableField("source")
+    private String source;
+
+    @ApiModelProperty(value= "渚涘簲鍟�")
+    @TableField("vendor")
+    private String vendor;
+
+    @ApiModelProperty(value= "姣忕鏁伴噺")
+    @TableField("qty_box")
+    private Double qtyBox;
+
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.locNo);

--
Gitblit v1.9.1