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/ProductionProductMainDto.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 3e171bc..843e4a6 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.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 com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,28 +10,36 @@
import java.time.LocalDateTime;
@Data
+@ExcelIgnoreUnannotated
public class ProductionProductMainDto extends ProductionProductMain {
@ApiModelProperty(value = "宸ュ崟缂栧彿")
+ @Excel(name = "宸ュ崟缂栧彿")
private String workOrderNo;
@ApiModelProperty(value = "宸ュ崟鐘舵��")
private String workOrderStatus;
@ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
+ @Excel(name = "鎶ュ伐浜�")
private String nickName;
@ApiModelProperty(value = "鎶ュ伐鏁伴噺")
+ @Excel(name = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
//浜у搧鍚嶇О
+ @Excel(name = "浜у搧鍚嶇О")
private String productName;
//浜у搧瑙勬牸鍨嬪彿
+ @Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
//鍗曚綅
+ @Excel(name = "鍗曚綅")
private String unit;
//閿�鍞悎鍚屽彿
+ @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
}
--
Gitblit v1.9.3