From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 62 +++----------------------------
1 files changed, 6 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index 297f6b9..ae2d3a4 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -1,64 +1,14 @@
package com.ruoyi.production.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
+import java.time.LocalDate;
-/**
- * @author :yys
- * @date : 2025/7/22 13:55
- */
@Data
-@ApiModel
-public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
-
- /**
- * 鐢熶骇浜篿d
- */
- @ApiModelProperty(value = "鐢熶骇浜篿d")
- private Long schedulingUserId;
-
- /**
- * 鎺掍骇浜哄悕绉�
- */
- @ApiModelProperty(value = "鐢熶骇浜哄悕绉�")
- private String schedulingUserName;
-
-
- /**
- * 宸ヨ祫
- */
- @ApiModelProperty(value = "宸ヨ祫")
- private BigDecimal wages;
-
- /**
- * 鐢熶骇鏁伴噺
- */
- @ApiModelProperty(value = "鐢熶骇鏁伴噺")
- private BigDecimal finishedNum;
-
- /**
- * 宸ユ椂瀹氶
- */
- @ApiModelProperty(value = "宸ユ椂瀹氶")
- private BigDecimal workHours;
-
- /**
- * 宸ュ簭
- */
- @ApiModelProperty(value = "宸ュ簭")
+public class SalesLedgerProductionAccountingDto {
+ private Long userId;
+ private String userName;
private String process;
- /**
- * 鎺掍骇鏃ユ湡
- */
- @ApiModelProperty(value = "鎺掍骇鏃ユ湡")
- private String schedulingDate;
-
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
- private String entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String entryDateEnd;
-
+ private LocalDate startDate;
+ private LocalDate endDate;
}
--
Gitblit v1.9.3