From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/dto/ProcessSchedulingDto.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessSchedulingDto.java b/src/main/java/com/ruoyi/production/dto/ProcessSchedulingDto.java
index da2ed71..1143abd 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessSchedulingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessSchedulingDto.java
@@ -30,7 +30,6 @@
@ApiModelProperty(value = "鎺掍骇鏁伴噺")
private BigDecimal schedulingNum;
-
/**
* 宸ユ椂瀹氶
*/
@@ -38,10 +37,18 @@
private BigDecimal workHours;
/**
+ * 浜х嚎
+ */
+ @ApiModelProperty(value = "浜х嚎")
+ private String productionLine;
+
+ /**
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
private String process;
+
+
/**
* 鎺掍骇鏃ユ湡
*/
@@ -66,5 +73,11 @@
@ApiModelProperty(value = "鍙ｅ懗鍒嗙被")
private String type;
+ /**
+ * 棰嗙敤
+ */
+ @ApiModelProperty(value = "棰嗙敤")
+ private String receive;
+
}
--
Gitblit v1.9.3