From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index b79839c..18c972d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -27,21 +27,25 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鐗╂枡")
- @TableId(value = "matnr", type = IdType.INPUT)
- private String matnr;
+ @ApiModelProperty(value= "浜у搧缂栫爜")
+ @TableId(value = "mat_no", type = IdType.INPUT)
+ private String matNo;
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
+ @TableId(value = "mat_name")
+ private String matName;
@ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
+ private String specs;
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
- private String type;
+ @ApiModelProperty(value= "灏哄")
+ private String size;
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
@ApiModelProperty(value= "渚涘簲鍟�")
private String supplier;
@@ -53,10 +57,10 @@
private String brand;
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private Double qty;
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
--
Gitblit v1.9.1