Merge remote-tracking branch 'origin/master'

18516761980

2021-11-05 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3

 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) {