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/Cutter.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java
index cb03de4..4e95a6a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java
@@ -9,6 +9,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
@@ -23,38 +24,48 @@
private String id;
//宸ュ簭鎴栧伐姝d
- @TableField(value = "process_step_id")
- private String processStepId;
+ @Excel(name = "鎵�灞炰笟鍔d", width = 15)
+ @TableField(value = "attribution_id")
+ private String attributionId;
- //宸ュ簭/宸ユ 1宸ュ簭 2宸ユ
- @TableField(value = "type")
- private Integer type;
+ //宸ュ簭/宸ユ 5宸ュ簭 6宸ユ
+ @Excel(name = "鎵�灞炵被鍨�", width = 15)
+ @TableField(value = "attribution_type")
+ private Integer attributionType;
//鍒�鍏峰悕绉�
+ @Excel(name = "鍒�鍏峰悕绉�", width = 15)
@TableField(value = "cutter_name")
private String cutterName;
//鍒�鍏风紪鍙�
+ @Excel(name = "鍒�鍏风紪鍙�", width = 15)
@TableField(value = "cutter_code")
private String cutterCode;
//鍒�鍏风被鍨�
+ @Excel(name = "鍒�鍏风被鍨�", width = 15,dicCode = "cutter_type")
@TableField(value = "cutter_type")
+ @Dict(dicCode = "cutter_type")
private String cutterType;
//棰濆畾瀵垮懡
+ @Excel(name = "棰濆畾瀵垮懡", width = 15)
@TableField(value = "lifetime")
private String lifetime;
//鍒�浣�
- @TableField(value = "cutter_position")
+ @Excel(name = "鍒�浣�", width = 15)
+ @TableField(value = "cutter_spacing")
private String cutterSpacing;
//鏁伴噺
+ @Excel(name = "鏁伴噺", width = 15)
@TableField(value = "quantity")
private Integer quantity;
//鎻忚堪
+ @Excel(name = "鎻忚堪", width = 15)
@TableField(value = "description")
private String description;
--
Gitblit v1.9.3