From 1918c5fe8c390ca90acff60b71e27257d65fb463 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 一月 2022 10:21:54 +0800
Subject: [PATCH] Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 584ce60..e302e02 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -36,10 +36,12 @@
@ApiModelProperty(value= "浜у搧缂栫爜")
@TableId(value = "mat_no")
+ @TableField("mat_no")
private String matNo;
@ApiModelProperty(value= "浜у搧鍚嶇О")
@TableId(value = "mat_name")
+ @TableField("mat_name")
private String matName;
@ApiModelProperty(value= "瑙勬牸")
@@ -50,6 +52,9 @@
@ApiModelProperty(value= "棰滆壊")
private String color;
+
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String supplier;
@ApiModelProperty(value= "鍗曢噸")
private Double weight;
@@ -132,6 +137,10 @@
@TableField("appe_time")
private Date appeTime;
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField(exist = false)
+ private String locNo;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
--
Gitblit v1.9.1