From 256c59555e2a5dffdd6d127a519d4f0944b80e7f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 五月 2025 16:29:38 +0800
Subject: [PATCH] #物料表动态字段搜索
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java | 12 +++++++++---
1 files changed, 9 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 3b1d374..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;
@@ -59,6 +61,9 @@
@ApiModelProperty(value= "鏄惁鍚敤 0: 涓嶅惎鐢� 1: 鍚敤 ")
private Short flagEnable;
+ @ApiModelProperty("鏁版嵁绫诲瀷")
+ private String varType;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -69,7 +74,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -89,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;
/**
@@ -102,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;
/**
@@ -146,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