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/voOp/VoIssueReport_temp.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java index 49d0d97..552cdbc 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java @@ -17,7 +17,7 @@ */ @Data -@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"}) +@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime","replyContent","replyPersonId", "stateId", "state"}) public class VoIssueReport_temp implements BaseEntity { private static final long serialVersionUID = 202411121448001L; @@ -70,6 +70,17 @@ private Date replyTime; /** + * 鍥炲鍐呭 + */ + private String replyContent; + + /** + * 鍥炲浜篒D + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + private Long replyPersonId; + + /** * 鐘舵�佸�� */ private Integer stateId; -- Gitblit v1.8.0