From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/CaseMain.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/CaseMain.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/CaseMain.java
index 7908be4..5025f01 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/CaseMain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/CaseMain.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -38,6 +40,8 @@
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
private LocalDateTime createTime;
@ApiModelProperty(value = "创建人")
@@ -45,6 +49,7 @@
private String createBy;
@ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("update_time")
private LocalDateTime updateTime;
@@ -68,5 +73,13 @@
@TableField("dept_id")
private Integer deptId;
-
+ @ApiModelProperty(value = "附件资料")
+ @TableField(exist = false)
+ private List<CaseMainFile> list;
+ @ApiModelProperty(value = "案件分类名称")
+ @TableField(exist = false)
+ private String typeName;
+ @ApiModelProperty(value = "所属部门名称")
+ @TableField(exist = false)
+ private String deptName;
}
--
Gitblit v1.7.1