From 35968d7e3a392e19c5593bd31422570812885d22 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 20 十一月 2025 16:01:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
new file mode 100644
index 0000000..113a8fd
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
@@ -0,0 +1,66 @@
+package com.example.erp.dto.mm;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.example.erp.entity.mm.FinishedOperateLog;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+@Data
+public class FinishedOperateLogDTO{
+    @ExcelProperty("缂栧彿")
+    private Long id;
+    @ExcelProperty("鎿嶄綔鍗曞彿")
+    private String operationOrderNumber;
+    @ExcelProperty("閿�鍞崟鍙�")
+    private String orderId;
+    @ExcelProperty("璁㈠崟搴忓彿")
+    private Integer operationNumber;
+    @ExcelProperty("绫诲瀷")
+    private String operateType;
+    @ExcelProperty("鏁伴噺")
+    private Integer quantity;
+    @ExcelProperty("鍗曚环")
+    private Double price;
+    @ExcelProperty("浜у搧Id")
+    private Integer productId;
+    @ExcelProperty("浜у搧")
+    private String productName;
+    @ExcelProperty("瀹�")
+    private Double width;
+    @ExcelProperty("楂�")
+    private Double height;
+    @ExcelProperty("闈㈢Н")
+    private Double area;
+    @ExcelProperty("閲戦")
+    private Double money;
+    @ExcelProperty("椤圭洰鍚嶇О")
+    private String project;
+    @ExcelProperty("瀹㈡埛鍚嶇О")
+    private String customerName;
+    @ExcelProperty("璁㈠崟绫诲瀷")
+    private String orderType;
+    @ExcelProperty("璋冩嫧閿�鍞崟鍙�")
+    private String staterOperationOrderNumber;
+    @ExcelProperty("璋冩嫧搴忓彿")
+    private String endOperationOrderNumber;
+    @ExcelProperty("鍒跺崟浜�")
+    private String operator;
+    @ExcelProperty("鍒跺崟鏃ユ湡")
+    private LocalDate operateTime;
+    @ExcelProperty("娴佺▼鍗″彿")
+    private String processId;
+    @ExcelProperty("棰嗗嚭绫诲瀷")
+    private String type;
+    @ExcelProperty("瀹℃牳浜�")
+    private String reviewed;
+    @ExcelProperty("瀹℃牳鏃ユ湡")
+    private LocalDate reviewedTime;
+    @ExcelProperty("澶囨敞")
+    private String remarks;
+
+
+
+
+}

--
Gitblit v1.8.0