From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 二月 2025 14:33:15 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java index c813a62..a93cfe3 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java @@ -1,7 +1,9 @@ package com.dy.pipIrrGlobal.voSt; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author :WuZeYu @@ -11,6 +13,10 @@ * 鐢ㄦ按鏃堕暱 > 鎸囧畾鍊� (鍒嗛挓) */ @Data +@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat" + ,"recordCount" +}) +@EqualsAndHashCode(callSuper=false) public class VoIntakeOpenCount extends VoIntake{ private static final long serialVersionUID = 202408051046001L; -- Gitblit v1.8.0