From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 29 十月 2024 09:39:48 +0800 Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码; 2、删除global模块中一些无用的备份; 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false),防止编译时警告 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java index de43043..70af947 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportLast.java @@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1; +import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo; import com.dy.common.mw.protocol.p206V202404.DataV202404; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo; import com.dy.common.po.BaseEntity; import com.dy.common.util.DateTime; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -61,16 +64,19 @@ /** * 鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") public Date dt; /** * 鎺у埗鍣ㄦ椂閽� */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") public Date rtuDt; /** * 鏁版嵁鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd") public Date dataDt; /** @@ -126,4 +132,5 @@ this.lossTotalAmountDay = cdData.lossTotalAmountDay ;// 婕忔崯姘撮噺 this.batteryVolt = cdData.batteryVolt ;// 鍚庡鐢垫睜鐢靛帇 } + } \ No newline at end of file -- Gitblit v1.8.0