From 009c2bcdb77a5963a639fcaa5bfd96e068db5546 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 17:59:20 +0800
Subject: [PATCH] 设备新增系统类型字段
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java
index 0a0ca7e..f11db6b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java
@@ -1,31 +1,35 @@
package org.jeecg.modules.activiti.entity;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
import java.util.Date;
@Data
@NoArgsConstructor
@TableName("nc_activiti_definition_info")
-@Api(value= "娴佺▼瀹氫箟")
+@Api(value= "DNC鎸囨淳璁惧娴佺▼瀹氫箟")
public class ActivitiDefinition {
@TableId(value = "id")
private String id;
@TableField(value = "act_name")
private String actName;
@TableField(value = "depart_id")
+ @Dict(dictTable = "mdc_production",dicCode = "id",dicText = "production_name")
private String departId;
@TableField(value = "approve_users")
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String approveUsers;
- @JsonIgnore
- @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
- @JsonIgnore
- @TableField(value = "update_time", select = false, fill = FieldFill.UPDATE)
+ @TableField(value = "update_time", fill = FieldFill.UPDATE)
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
@JsonIgnore
@TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
--
Gitblit v1.9.3