Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-08-03 1ff0f95e1a2e10af8d356f797106f1e4b9ad873f

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

@@ -31,6 +31,7 @@
                MatCode matCodeObj = matCodeService.selectById(erpList.getFnumber());
                if (!Cools.isEmpty(matCodeObj)) {
                    erpList.setFname(matCodeObj.getMatName());
                    erpList.setFmodel(matCodeObj.getStr3());
                }
            }
        }