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/DeviceType.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceType.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceType.java
index a0a3ed5..e200f5b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceType.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceType.java
@@ -8,11 +8,9 @@
import lombok.Data;
import lombok.NoArgsConstructor;
import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.mdc.entity.MdcEquipment;
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
@Data
@NoArgsConstructor
@@ -23,20 +21,22 @@
private String id;
//宸ュ簭鎴栧伐姝d
- @TableField(value = "process_step_id")
- private String processStepId;
+ @TableField(value = "attribution_id")
+ private String attributionId;
- //宸ュ簭/宸ユ 1宸ュ簭 2宸ユ
- @TableField(value = "type")
- private Integer type;
+ //宸ュ簭/宸ユ 5宸ュ簭 6宸ユ
+ @TableField(value = "attribution_type")
+ private Integer attributionType;
//杞﹂棿id
@TableField(value = "production_id")
+ @Dict(dictTable = "mdc_production", dicCode = "id", dicText = "production_name")
private String productionId;
- //璁惧绫诲瀷
- @TableField(value = "device_type")
- private Integer deviceType;
+ //璁惧绫�
+ @TableField(value = "device_management_id")
+ @Dict(dictTable = "nc_device_management", dicCode = "id", dicText = "device_management_name")
+ private String deviceManagementId;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField(value = "create_time", fill = FieldFill.INSERT)
@@ -60,6 +60,7 @@
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
- private transient List<MdcEquipment> equipmentList;
+ @Dict(dictTable = "nc_device_management", dicCode = "id", dicText = "device_management_code")
+ private transient String deviceManagementCode;
}
--
Gitblit v1.9.3