From 4c8c41b153db001d80a990090e2cce1669af72dc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 22 五月 2023 17:04:13 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index ef2b85b..37b2284 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -43,8 +43,8 @@
     @ExcelProperty("鍟嗗搧鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "搴忓垪鐮�")
-    @ExcelProperty("搴忓垪鐮�")
+    @ApiModelProperty(value= "鎵瑰彿")
+    @ExcelProperty("鎵瑰彿")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -163,7 +163,7 @@
         if (!Cools.isEmpty(locMast)){
             return String.valueOf(locMast.getLocNo());
         }
-        return null;
+        return this.locNo;
     }
 
     public String getBeBatch$(){

--
Gitblit v1.9.1