From 94e38780aaaca83dcec2935109b9399f977f3cc4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 15 十二月 2022 16:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs

---
 src/main/java/com/zy/common/service/CommonService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8ac07f8..58b105a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -160,7 +160,7 @@
                     // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                     LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                     if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-                        if (shallowLoc.getLocType1()>=locTypeDto.getLocType1()){
+                        if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
                             continue;
                         }
                         if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {

--
Gitblit v1.9.1