From b0cede2d821dddcbc519df5be14b6f5045dd4eca Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 05 六月 2021 10:26:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/zy/asrs/entity/LocNormal.java b/src/main/java/com/zy/asrs/entity/LocNormal.java
index 453c3a6..bbd8357 100644
--- a/src/main/java/com/zy/asrs/entity/LocNormal.java
+++ b/src/main/java/com/zy/asrs/entity/LocNormal.java
@@ -48,6 +48,9 @@
     @ApiModelProperty(value= "浠撳簱")
     private String warehouse;
 
+    @TableField(exist = false)
+    private String warehouseName;
+
     @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 

--
Gitblit v1.9.1