From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 2 +-
1 files changed, 1 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 1462c49..78dcea0 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -46,7 +46,7 @@
/**
* 宸ヨ祫瀹氶
*/
- @Excel(name = "宸ヨ祫瀹氶")
+// @Excel(name = "宸ヨ祫瀹氶")
private BigDecimal salaryQuota;
/**
--
Gitblit v1.9.3