From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 19 六月 2024 11:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/common/model/LocTypeDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 454a5f6..38fb7d2 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -34,7 +34,7 @@
// if (staProtocol.isHigh() == staProtocol.isLow()) {
// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
// }
- if (staProtocol.getSiteId() == 106){
+ if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
this.locType1 = 2; // 楂樺簱浣�
}else {
this.locType1 = 1; // 浣庡簱浣�
--
Gitblit v1.9.1