From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java index 0567f49..03138d6 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @Author: liurunyu @@ -10,6 +11,7 @@ */ @Data +@EqualsAndHashCode(callSuper=false) @JsonPropertyOrder({"id", "intakeId", "clientId", -- Gitblit v1.8.0