Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-08-03 1ff0f95e1a2e10af8d356f797106f1e4b9ad873f

 src/main/webapp/static/js/locNormal/locNormalIn.js

@@ -195,7 +195,7 @@
    function getInBound() {
        // 获取仓库下拉
        $.ajax({
            url: baseUrl + "/locArea/queryAll/auth",
            url: baseUrl + "/locArea/query/allArea",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {