From 6704225b102b684e6ce4e88fa897414fac06c9f1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 26 四月 2021 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/views/locNormal/locNormal.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index fb082b2..ff56feb 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -161,7 +161,7 @@
     <script type="text/html" id="locArea">
         {{
         locArea.map(function(item){
-        if (d.warehouse == item.id) {
+        if (d.warehouse == item.uuid) {
         return item.name;
         }
         });

--
Gitblit v1.9.1