From 0c989fbcca1cd4b53d59e8ba288227a5a68d92a4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 18:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/laboratory
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TChemistWorkEvaluate.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TChemistWorkEvaluate.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TChemistWorkEvaluate.java
index 32919f6..9b62cdf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TChemistWorkEvaluate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TChemistWorkEvaluate.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;
@@ -71,9 +72,10 @@
@ApiModelProperty(value = "评定人")
@TableField("evaluate_person_id")
- private Integer evaluatePersonId;
+ private Long evaluatePersonId;
@ApiModelProperty(value = "评定时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("evaluate_time")
private LocalDateTime evaluateTime;
--
Gitblit v1.7.1