Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms...

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

 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;
        }
        });