From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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
index b6d6925..a64fbc6 100644
--- 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
@@ -24,7 +24,7 @@
@TableField(value = "device_no")
private String deviceNo;
@TableField(value = "depart_id")
- @Dict(dictTable = "sys_department",dicCode = "depart_id",dicText = "depart_name")
+ @Dict(dictTable = "mdc_production",dicCode = "id",dicText = "production_name")
private String departId;
@TableField(value = "control_system")
private String controlSystem;
@@ -36,10 +36,10 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @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)
--
Gitblit v1.9.3