From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index d6a6f70..dadccf3 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -79,8 +79,8 @@
public static void setMatCode(MatCode matCode, M_item item) {
matCode.setMatNo(item.getMnumber()); // 鐗╂枡缂栧彿
matCode.setMatName(item.getMname()); // 鐗╂枡鎻忚堪
- matCode.setStr2(item.getMmodel()); // 鐗╂枡绫诲埆
- matCode.setStr2(item.getMtypename());
+ matCode.setStr3(item.getMmodel()); // 鐗╂枡绫诲埆
+ matCode.setStr2(item.getMtypename()); // 瑙勬牸鍨嬪彿
}
// excel ----------------------------------------------------------------------
--
Gitblit v1.9.1