From c6bc9682699d3e10dc06a3d6641a70179e64f9a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 九月 2021 08:32:11 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/java/com/zy/asrs/entity/WrkDetl.java |    6 ++++++
 1 files changed, 6 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..f318964 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= "瑙勬牸")
@@ -132,6 +134,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