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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index eefd3cf..e302e02 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -53,6 +53,9 @@
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
+    @ApiModelProperty(value= "鎵瑰彿")
+    private String supplier;
+
     @ApiModelProperty(value= "鍗曢噸")
     private Double weight;
 
@@ -136,7 +139,7 @@
 
     @ApiModelProperty(value= "搴撲綅鍙�")
     @TableField(exist = false)
-    private Integer locNo;
+    private String locNo;
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){

--
Gitblit v1.9.1