From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
index 8f79c0f..eb70788 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
@@ -32,6 +32,9 @@
//闆朵欢id
@TableField(value = "parts_id")
private String partsId;
+ //宸ヨ壓瑙勭▼id
+ @TableField(value = "psv_id")
+ private String psvId;
//宸ュ簭id
@TableField(value = "process_id")
private String processId;
@@ -70,14 +73,12 @@
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- @TableField(value = "create_time", fill = FieldFill.INSERT)
+ @TableField(value = "update_time", fill = FieldFill.INSERT)
private Date updateTime;
- @JsonIgnore
- @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String createBy;
- @JsonIgnore
- @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String updateBy;
@JsonIgnore
--
Gitblit v1.9.3