From 979f2505861b77b8702604739486b62f1e339e76 Mon Sep 17 00:00:00 2001 From: dubin <bindu_bean@163.com> Date: 星期二, 07 十月 2025 08:44:11 +0800 Subject: [PATCH] 联调 --- src/main/java/com/zy/common/model/LocTypeDto.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index d68e24f..8fc9892 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -13,7 +13,7 @@ @Data public class LocTypeDto { - // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:涓簱浣峿 + // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,5:楂樺簱浣�,2:涓簱浣�,6:瓒呴珮搴撲綅} private Short locType1; // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿 @@ -32,9 +32,11 @@ if (basDevp.getLocType1() == 1) { this.locType1 = 1; // 浣庡簱浣� } else if (basDevp.getLocType1() ==2){ - this.locType1 = 2; // 楂樺簱浣� - } else { - this.locType1 = 3; // 涓簱浣� + this.locType1 = 2; // 涓簱浣� + } else if (basDevp.getLocType1() == 5){ + this.locType1 = 5; // 楂樺簱浣� + }else if (basDevp.getLocType1() == 6){ + this.locType1 = 6;//瓒呴珮搴撲綅 } log.info(JSON.toJSONString(this)); } -- Gitblit v1.9.1