From b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/controller/MapController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 7489168..46f72a1 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -93,6 +93,7 @@
jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
}
jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+ jsonObject.put("locNo$", locMast.getLocNo$());//璁剧疆搴撲綅鍙�
jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
jsonObject.put("barcode", Optional.ofNullable(locMast.getBarcode()).orElse("鏃�"));//鎵樼洏鍙�
--
Gitblit v1.9.1