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

luxiaotao1123

2022-04-02 c61be765fe40fce1a57471a8fc8b93932c0a970c

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

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -75,7 +75,7 @@
        return R.ok(matService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/matCode/auth0")
    @RequestMapping(value = "/mat/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));

 src/main/webapp/views/pda/matQuery.html

@@ -115,10 +115,10 @@
            return;
        }
        $.ajax({
            url: baseUrl + "/matCode/auth",
            url: baseUrl + "/mat/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                id: el.value
                matnr: el.value
            },
            method: 'POST',
            success: function (res) {