From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
index 3d6208b..8a99e04 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
@@ -1,6 +1,9 @@
package com.ruoyi.project.domain;
import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -114,6 +117,7 @@
*/
@ApiModelProperty("涓撳缁撹鏃堕棿")
@Excel(name = "涓撳缁撹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expertTime;
/**
@@ -123,6 +127,19 @@
@Excel(name = "0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
private String status;
+ /**
+ * 闄勪欢澶氫釜;闅斿紑
+ */
+ @ApiModelProperty("闄勪欢澶氫釜;闅斿紑")
+ @Excel(name = "闄勪欢澶氫釜;闅斿紑")
+ private String filePatch;
+ @ApiModelProperty("绛惧悕")
+ @Excel(name = "绛惧悕")
+ private String sigin;
+
+ @ApiModelProperty("绛惧悕")
+ @TableField(exist = false)
+ private List<ServiceEthicalreviewopinions> ethicalreviewopinionsList;
}
--
Gitblit v1.9.3