From e19b7b5d6b4a7658a7e172527017052a68b49f4d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 23 三月 2026 16:01:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index d25f9cf..249e039 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -24,15 +25,26 @@
private Long id;
/**
+ * 璁惧鍙拌处id
+ */
+// @Excel(name = "璁惧鍙拌处id")
+ private Long deviceLeaderId;
+
+ /**
* 宸ュ簭鍚嶇О
*/
@Excel(name = "宸ュ簭鍚嶇О")
private String name;
+ @ApiModelProperty(value ="宸ュ簭鏈哄彴")
+ @TableField(value = "device_name")
+ @Excel(name = "宸ュ簭鏈哄彴")
+ private String deviceName;
+
/**
* 宸ュ簭缂栧彿
*/
- @Excel(name = "宸ュ簭缂栧彿")
+// @Excel(name = "宸ュ簭缂栧彿")
private String no;
/**
@@ -46,7 +58,12 @@
* 宸ヨ祫瀹氶
*/
@Excel(name = "宸ヨ祫瀹氶")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
+
+ @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+ @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
+ private Long type;
/**
* 鍒涘缓鏃堕棿
@@ -70,5 +87,13 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value ="鏄惁璐ㄦ")
+ @Excel(name = "鏄惁璐ㄦ")
+ private Boolean isQuality;
+
+
+ @ApiModelProperty(value ="璁惧id")
+ @TableField(value = "device_id")
+ private Long deviceId;
}
--
Gitblit v1.9.3