From 5ebf8df590e50db08e018372e3b62bc281d062b5 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 12 五月 2025 16:44:52 +0800 Subject: [PATCH] #Agv解绑 --- rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java index 5c339d8..b3e1b0e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java @@ -4,6 +4,8 @@ import java.text.SimpleDateFormat; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -72,7 +74,6 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") - @TableLogic private Integer deleted; /** @@ -92,6 +93,7 @@ */ @ApiModelProperty(value= "娣诲姞鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; /** @@ -105,6 +107,7 @@ */ @ApiModelProperty(value= "淇敼鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date updateTime; /** @@ -149,9 +152,9 @@ if (null == this.unique){ return null; } switch (this.unique){ case 0: - return " 闈炲敮涓�"; + return "涓绘暟鎹�"; case 1: - return " 鍞竴"; + return "涓氬姟鏁版嵁"; default: return String.valueOf(this.unique); } -- Gitblit v1.9.1