Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-03-28 c4b00b0268f35a7a9e016e818b0f6e27bc3876f0

 zy-asrs-wms/src/main/webapp/static/js/common.js

@@ -78,6 +78,9 @@
    var param = (child?parent.window:window).location.href.split("?")[1];
    if (null != param) {
        var resourceId = getQueryVariable('resourceId')
        if (resourceId == false) {
            resourceId = param.split("=")[1];
        }
        $.ajax({
            url: baseUrl+"/power/menu/"+resourceId+"/auth",
            headers: {'token': localStorage.getItem('token')},