From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectProposal.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectProposal.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectProposal.java
index 3260832..dc43583 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectProposal.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectProposal.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +29,10 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+
+ @ApiModelProperty(value = "提交人id")
+ @TableField("commit_user_id")
+ private Long commitUserId;
@ApiModelProperty(value = "项目课题方案")
@TableField("project_name")
@@ -79,9 +84,10 @@
@ApiModelProperty(value = "审批人")
@TableField("audit_person_id")
- private String auditPersonId;
+ private Long auditPersonId;
@ApiModelProperty(value = "审批时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("audit_time")
private LocalDateTime auditTime;
--
Gitblit v1.7.1