Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

luxiaotao1123

2022-04-02 c61be765fe40fce1a57471a8fc8b93932c0a970c

 src/main/webapp/static/js/order/order.js

@@ -306,7 +306,7 @@
                                    if (existMats.indexOf(item.value) === -1) {
                                        // 查询物料详情
                                        $.ajax({
                                            url: baseUrl+"/matCode/covert/"+item.value+"/auth",
                                            url: baseUrl+"/mat/covert/"+item.value+"/auth",
                                            headers: {'token': localStorage.getItem('token')},
                                            method: 'GET',
                                            async: false,