Merge remote-tracking branch 'origin/master'

18516761980

2021-11-05 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3

 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());
                }
            }
        }