From 249dc044ca3bb63b40da5cf67788981992887256 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 02 十月 2023 13:49:00 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 7f0bd37..89530db 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -113,14 +113,14 @@
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绫诲瀷妫�娴�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
- // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
-// if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
-// return false;
-// }
- return true;
+ public static boolean checkLocType(LocMast loc, LocTypeDto dto){
+ //搴撲綅绫诲瀷蹇呴』鍜屼紶鍏ョ殑搴撲綅淇″彿涓�鑷�
+ if (loc.getLocType1().equals(dto.getLocType1())) {
+ return true;
+ }
+ return false;
}
}
--
Gitblit v1.9.1