From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java
index 8faa482..a231727 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionVO.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.project.domain.ServiceDonatecomporgan;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
+import java.util.List;
@Data
public class DonationCompletionVO {
@@ -18,12 +20,15 @@
private String donationcategory;
private String recordstate;
private String name;
+ private String caseno;
private String sex;
private Long idcardtype;
private String idcardno;
private Long age;
private String ageunit;
- private String birthday;
+ private Long age2;
+ private String ageunit2;
+ private Date birthday;
private String nationality;
private String nation;
private String reporterno;
@@ -32,6 +37,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date reporttime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date donatetime;
private Long dcid;
private Long infoid;
private String dcdonorno;
@@ -88,4 +96,6 @@
@ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
private Integer terminationCase;
+
+ private List<ServiceDonatecomporgan> serviceDonatecomporganList;
}
--
Gitblit v1.9.3