From 41326b3129ae3e4ef7a45bc16dba64dc9dd27404 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 04 九月 2024 09:58:14 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs-erp

---
 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 89530db..6c0676e 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -37,7 +37,7 @@
 //        wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
 //        wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
 //        wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О
-//        wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜
+//        wrkDetl.setZpallet(locDetl.getZpallet()); // 璐ф灦鏉$爜
 //    }
 //
 //    public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
@@ -66,7 +66,7 @@
 //        locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
 //        locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
 //        locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О
-//        locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
+//        locDetl.setZpallet(wrkDetl.getZpallet()); // 璐ф灦鏉$爜
 //    }
 //
 //    public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {

--
Gitblit v1.9.1