From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

---
 src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
new file mode 100644
index 0000000..f4ebe75
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -0,0 +1,38 @@
+package com.ruoyi.production.dto;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.production.pojo.ProductWorkOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProductWorkOrderDto extends ProductWorkOrder {
+
+    //浜у搧鍚嶇О
+    @ApiModelProperty(value = "浜у搧鍚嶇О")
+    private String productName;
+
+    //瑙勬牸
+    @ApiModelProperty(value = "瑙勬牸")
+    private String model;
+
+    //宸ュ簭
+    @ApiModelProperty(value = "宸ュ簭")
+    private String processName;
+
+    //鍗曚綅
+    @ApiModelProperty(value = "鍗曚綅")
+    private String unit;
+
+
+    //鐢熶骇璁㈠崟鍙�
+    @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+    private String productOrderNpsNo;
+
+    @ApiModelProperty(value = "瀹屾垚杩涘害")
+    private BigDecimal completionStatus;
+}

--
Gitblit v1.9.3