From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java b/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
index 241086e..0ab14d6 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
@@ -1,5 +1,6 @@
package com.ycl.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -13,6 +14,10 @@
public class ProgressReportResponseVO {
// 璁″垝椤筰d
private Integer id;
+ // 杩涘害涓婃姤id
+ private Integer progressReportId;
+ // 瀹℃牳璁板綍id
+ private Integer examineRecordId;
private Integer planTime;
private Integer PlanTimeFlag;
private String title;
--
Gitblit v1.8.0