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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 18fe087..21c3f62 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -60,11 +60,11 @@
* 宸ヨ祫瀹氶
*/
@Excel(name = "宸ヨ祫瀹氶")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+// @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
@ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
- @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
+// @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
private Long type;
/**
@@ -98,4 +98,11 @@
@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