From b4604967492c123e68cab3b2c016b5469bfdbffa Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 24 四月 2026 17:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 425f1f0..21c3f62 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -31,16 +31,23 @@
private Long deviceLeaderId;
/**
+ * 宸ュ簭缂栧彿
+ */
+ @Excel(name = "宸ュ簭缂栧彿")
+ private String no;
+
+ /**
* 宸ュ簭鍚嶇О
*/
@Excel(name = "宸ュ簭鍚嶇О")
private String name;
- /**
- * 宸ュ簭缂栧彿
- */
- @Excel(name = "宸ュ簭缂栧彿")
- private String no;
+ @ApiModelProperty(value ="宸ュ簭鏈哄彴")
+ @TableField(value = "device_name")
+ @Excel(name = "宸ュ簭鏈哄彴")
+ private String deviceName;
+
+
/**
* 澶囨敞
@@ -53,10 +60,11 @@
* 宸ヨ祫瀹氶
*/
@Excel(name = "宸ヨ祫瀹氶")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+// @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
@ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+// @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
private Long type;
/**
@@ -82,7 +90,19 @@
private Long tenantId;
@ApiModelProperty(value ="鏄惁璐ㄦ")
+ @Excel(name = "鏄惁璐ㄦ")
private Boolean isQuality;
+
+ @ApiModelProperty(value ="璁惧id")
+ @TableField(value = "device_id")
+ private Long deviceId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3