From 43591a0f6820bb7bfa1501b7cc4af6729686dd19 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 12 十二月 2024 17:57:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/domain/form/ProgressReportResponseForm.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java b/business/src/main/java/com/ycl/domain/form/ProgressReportResponseForm.java similarity index 79% rename from business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java rename to business/src/main/java/com/ycl/domain/form/ProgressReportResponseForm.java index 920c4c6..e1d6a59 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java +++ b/business/src/main/java/com/ycl/domain/form/ProgressReportResponseForm.java @@ -1,6 +1,5 @@ -package com.ycl.domain.vo; +package com.ycl.domain.form; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.domain.entity.File; import lombok.AllArgsConstructor; import lombok.Data; @@ -13,13 +12,13 @@ @Data @AllArgsConstructor @NoArgsConstructor -public class ProgressReportResponseVO { +public class ProgressReportResponseForm { // 璁″垝椤筰d - private Integer id; + private Long id; // 杩涘害涓婃姤id - private Integer progressReportId; + private Long progressReportId; // 瀹℃牳璁板綍id - private Integer examineRecordId; + private Long examineRecordId; private Integer planTime; private Integer PlanTimeFlag; private String title; -- Gitblit v1.8.0