From 539624ef39177ebb6fd5577b83df7097dd6f4bec Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 09 三月 2026 09:21:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 1462c49..e55ab4f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -47,8 +47,12 @@
* 宸ヨ祫瀹氶
*/
@Excel(name = "宸ヨ祫瀹氶")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
+ @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+ private Long type;
+
/**
* 鍒涘缓鏃堕棿
*/
--
Gitblit v1.9.3