From 0cb87e5f72febf26b3a17b4eb61e8d1b8c079279 Mon Sep 17 00:00:00 2001 From: Houjie <714924425@qq.com> Date: 星期一, 26 五月 2025 10:03:44 +0800 Subject: [PATCH] 刀具刃磨-刃磨刀具选择列表接口/ 工具报损-审批、提交 工具盘点-审批 ,提交 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolSharpening.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolSharpening.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolSharpening.java index f34ede7..35ef615 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolSharpening.java +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolSharpening.java @@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.IdType; 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; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; /** * @Description: tms_tool_sharpening @@ -40,6 +43,8 @@ private String toolId; /** 鍒冪(鏃堕棿 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "鍒冪(鏃堕棿") private Date sharpeningTime; @@ -49,6 +54,7 @@ /** 璐d换浜� */ @ApiModelProperty(value = "璐d换浜�") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") private String responsiblePerson; /** 澶囨敞 */ @@ -64,6 +70,8 @@ private String createBy; /** 鍒涘缓鏃堕棿 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "鍒涘缓鏃堕棿") private Date createTime; @@ -72,6 +80,8 @@ private String updateBy; /** 鏇存柊鏃堕棿 */ - @ApiModelProperty(value = "鏇存柊鏃堕棿") - private Date updateTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鏇存柊鏃ユ湡") + private java.util.Date updateTime; } -- Gitblit v1.9.3