From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index fdbcc05..199e862 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -55,16 +55,20 @@
@Excel(name = "澶囨敞")
private String remark;
+ @ApiModelProperty(value ="鎶ュ伐浜篿ds")
+ @TableField(value = "user_ids")
+ @Excel(name = "鎶ュ伐浜篿ds")
+ private String userIds;
/**
* 宸ヨ祫瀹氶
*/
- @Excel(name = "宸ヨ祫瀹氶")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @Excel(name = "宸ヨ祫瀹氶" )
+// @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
@ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
- @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
+// @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
private Long type;
/**
--
Gitblit v1.9.3