From 18eb8ad4c66fd8515706e2a910ad50ac8f06ba22 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 05 六月 2025 16:58:07 +0800
Subject: [PATCH] 工具管理-增加刃磨出库
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolSharpening.java | 18 ++++++++++++++++--
1 files changed, 16 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..95378ab 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;
@@ -47,8 +52,13 @@
@ApiModelProperty(value = "鍒冪（缁撴灉鍙婂缓璁�")
private String sharpeningResult;
+ /** 鍒冪（鐘舵��;1:寰呭垉纾紱2:鍒冪（涓紱3:宸插畬鎴� */
+ @ApiModelProperty(value = "鍒冪（鐘舵��;1:寰呭垉纾紱2:鍒冪（涓紱3:宸插畬鎴�")
+ private String sharpeningStatus;
+
/** 璐ｄ换浜� */
@ApiModelProperty(value = "璐ｄ换浜�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
private String responsiblePerson;
/** 澶囨敞 */
@@ -64,6 +74,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 +84,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