From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
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