From 84d7dbea21cbe9276bd1eccdb3e60daef095242e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 六月 2021 11:33:57 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

---
 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