From e4db9c4fc4e40d7b41ee0014aaa9feb8ba9e9bf0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 17:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index b3c6034..d6a6f70 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -80,6 +80,7 @@
matCode.setMatNo(item.getMnumber()); // 鐗╂枡缂栧彿
matCode.setMatName(item.getMname()); // 鐗╂枡鎻忚堪
matCode.setStr2(item.getMmodel()); // 鐗╂枡绫诲埆
+ matCode.setStr2(item.getMtypename());
}
// excel ----------------------------------------------------------------------
--
Gitblit v1.9.1