From 5a8064c78b2138ededdca56ec1fcf8eb7e8bb9ae Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期五, 13 六月 2025 15:18:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index e60aa1f..313cd42 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -155,7 +155,7 @@
}
}
if (locMast.getLocSts().equals("O")) {
- locMast.setBarcode(null);
+ locMast.setBarcode("");
}
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
--
Gitblit v1.9.1