From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java
index 47cb059..68bcb23 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionAccountVo.java
@@ -8,7 +8,7 @@
import java.time.LocalDate;
@Data
-@Schema(name = "ProductionAccountVo", description = "鐢熶骇鏍哥畻鍒嗛〉杩斿洖瀵硅薄")
+@Schema(name = "ProductionAccountVo", description = "鐢熶骇鏍哥畻鍒嗛〉缁撴灉")
public class ProductionAccountVo {
@Schema(description = "瀹㈡埛鍚堝悓鍙�")
@@ -20,7 +20,7 @@
@Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @Schema(description = "浜у搧澶х被")
+ @Schema(description = "浜у搧绫诲埆")
private String productCategory;
@Schema(description = "瑙勬牸鍨嬪彿")
@@ -29,28 +29,34 @@
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "鐢熶骇浜篒D")
+ @Schema(description = "鎺掍骇浜哄憳ID")
private Long schedulingUserId;
- @Schema(description = "鐢熶骇浜哄悕绉�")
+ @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
private String schedulingUserName;
@Schema(description = "宸ヨ祫")
private BigDecimal wages;
- @Schema(description = "鐢熶骇鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal finishedNum;
- @Schema(description = "宸ユ椂瀹氶")
+ @Schema(description = "宸ヨ祫瀹氶")
private BigDecimal workHours;
+
+ @Schema(description = "宸ユ椂")
+ private BigDecimal workHour;
+
+ @Schema(description = "浜у嚭鐜�")
+ private String outputRate;
@Schema(description = "宸ュ簭")
private String process;
- @Schema(description = "鐢熶骇鏃ユ湡")
+ @Schema(description = "鎺掍骇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate schedulingDate;
- @Schema(description = "鐢熶骇鏈堜唤(yyyy-MM)")
+ @Schema(description = "鎺掍骇鏈堜唤(yyyy-MM)")
private String schedulingMonth;
}
--
Gitblit v1.9.3