From 56c6afb58c29c785b0a363d1dac183c4b1b2e1aa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 17 一月 2026 15:53:31 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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..6707622 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -1,5 +1,7 @@
package com.ruoyi.production.dto;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,7 @@
*/
@Data
@ApiModel
+@ExcelIgnoreUnannotated
public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
/**
@@ -24,6 +27,7 @@
* 鎺掍骇浜哄悕绉�
*/
@ApiModelProperty(value = "鐢熶骇浜哄悕绉�")
+ @Excel(name = "鐢熶骇浜�")
private String schedulingUserName;
@@ -31,29 +35,34 @@
* 宸ヨ祫
*/
@ApiModelProperty(value = "宸ヨ祫")
+ @Excel(name = "宸ヨ祫")
private BigDecimal wages;
/**
* 鐢熶骇鏁伴噺
*/
@ApiModelProperty(value = "鐢熶骇鏁伴噺")
+ @Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
/**
* 宸ユ椂瀹氶
*/
@ApiModelProperty(value = "宸ユ椂瀹氶")
+ @Excel(name = "宸ユ椂瀹氶")
private BigDecimal workHours;
/**
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
/**
* 鎺掍骇鏃ユ湡
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
+ @Excel(name = "鐢熶骇鏃ユ湡")
private String schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
--
Gitblit v1.9.3