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/vo/EthicalReviewVO.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
index 01a32db..8f71754 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
@@ -626,17 +626,7 @@
@Excel(name = "鎺ユ敹鐘舵��0寰呮帴鏀�1鏈帴鏀�2宸叉帴鏀�3瓒呮椂4涓5瀹屾垚")
private String receiveStatus;
- /** 鍙戣捣鏃堕棿 */
- @ApiModelProperty("鍙戣捣鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍙戣捣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date startTime;
- /** 缁撴潫鏃堕棿 */
- @ApiModelProperty("缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date endTime;
@ApiModelProperty("浼︾悊瀹℃煡id")
@Excel(name = "浼︾悊瀹℃煡id")
@@ -646,4 +636,12 @@
@Excel(name = "绛惧悕")
private String sigin;
+ @ApiModelProperty("涓撳绫诲瀷")
+ @Excel(name = "涓撳绫诲瀷")
+ private String expertType;
+
+ @ApiModelProperty("浼︾悊瀹℃煡闄勪欢")
+ @Excel(name = "浼︾悊瀹℃煡闄勪欢")
+ private String filePatch;
+
}
--
Gitblit v1.9.3