From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/controller/ERPrelevantController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
index 3207738..5dad7f7 100644
--- a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
+++ b/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());
}
}
}
--
Gitblit v1.9.1