From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java new file mode 100644 index 0000000..a64fbc6 --- /dev/null +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java @@ -0,0 +1,48 @@ +package org.jeecg.modules.dnc.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.jeecg.common.aspect.annotation.Dict; + +import java.util.Date; + +/** + * @Description: 璁惧鐗规畩瀛楃 + * @author clown + */ +@Data +@NoArgsConstructor +@TableName(value = "nc_device_characters") +@ApiModel(value = "璁惧鐗规畩瀛楃") +public class DeviceCharacters { + @TableId(value = "id") + private String id; + @TableField(value = "device_no") + private String deviceNo; + @TableField(value = "depart_id") + @Dict(dictTable = "mdc_production",dicCode = "id",dicText = "production_name") + private String departId; + @TableField(value = "control_system") + private String controlSystem; + @TableField(value = "characters") + private String characters; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @TableField(value = "create_time", fill = FieldFill.INSERT) + private Date createTime; + @TableField(value = "update_time", fill = FieldFill.UPDATE) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date updateTime; + @TableField(value = "create_by",fill = FieldFill.INSERT) + private String createBy; + @TableField(value = "update_by", fill = FieldFill.UPDATE) + private String updateBy; + @JsonIgnore + @TableLogic + @TableField(value = "delete_flag", select = false) + private Integer deleteFlag = 0; + +} -- Gitblit v1.9.3