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

lsh

1 天以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

 src/main/webapp/static/js/mat/mat.js

@@ -341,7 +341,7 @@
                                +"upc;" +res.data[i].sku+";"
                                +"supplier;" +res.data[i].supplier;
                        } else {
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="
                            res.data[i]["barcodeUrl"]=baseUrl+"/ehumac/code/auth?type=2&param="
                                +"orderNo;cs2025092313;"
                                +"sku;" +res.data[i].matnr+";"
                                +"po;" +res.data[i].supp+";"