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-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
index 88eebae..cefff4d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
@@ -48,7 +48,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private Date startTime;
+ private Date startDate;
/**
* 缁撴潫鏃堕棿
*/
@@ -56,13 +56,12 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private Date endTime;
+ private Date endDate;
/**
* 鍋滄満鍘熷洜id
*/
@Excel(name = "鍋滄満鍘熷洜id", width = 15)
@ApiModelProperty(value = "鍋滄満鍘熷洜id")
- @Dict(dictTable = "mdc_downtime_reason",dicCode = "id",dicText = "downtime_type")
private String reasonId;
/**
* 鐘舵�侊紙0鏈笂鎶ワ紝1宸蹭笂鎶ワ級
--
Gitblit v1.9.3