Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

zyx

2024-03-21 c253255495465d4406fcaddeb7be40d15fce290a

 src/main/webapp/static/js/agvLocMast/locMast.js

@@ -55,7 +55,7 @@
            // ,{field: 'barcode', align: 'center',title: ''}
            // ,{field: 'PdcType', align: 'center',title: ''}
            // ,{field: 'ctnNo', align: 'center',title: ''}
            //,{field: 'locType1$', align: 'center',title: '高低类型'}
            ,{field: 'locType1$', align: 'center',title: '库位类型'}
            // ,{field: 'locType2$', align: 'center',title: '宽窄类型'}
            // ,{field: 'locType3$', align: 'center',title: '轻重类型'}

@@ -226,7 +226,7 @@
                            $.ajax({
                                url: baseUrl+"/agv/locMast/init/auth",
                                headers: {'token': localStorage.getItem('token')},
                                data: JSON.stringify(param),
                                data: JSON.stringify("param"),
                                dataType:'json',
                                contentType:'application/json;charset=UTF-8',
                                method: 'POST',