From 8d0b466ef4fe497932e15c186688679e55a26f62 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 117 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java b/src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java
new file mode 100644
index 0000000..6bbbf44
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java
@@ -0,0 +1,117 @@
+package org.jeecg.modules.cms.vo;
+
+import org.jeecg.modules.cms.entity.CuttingInboundDetail;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import java.util.List;
+
+public class CuttingInboundExportVo {
+    /** 涓婚敭 */
+    @Excel(name = "鍏ュ簱鍗�", width = 15)
+    private String id;
+
+    /** 鍏ュ簱浜� */
+    @Excel(name = "鍏ュ簱浜�", width = 15,dictTable = "sys_user",dicCode = "id",dicText = "realname")
+    private String receiver;
+
+    /** 鍏ュ簱鏃堕棿 */
+    @Excel(name = "鍏ュ簱鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date receiveTime;
+
+    /** 鍏ュ簱璇存槑 */
+    @Excel(name = "鍏ュ簱璇存槑", width = 15)
+    private String receiveComment;
+
+    /** 纭浜� */
+    @Excel(name = "纭浜�", width = 15,dictTable = "sys_user",dicCode = "id",dicText = "realname")
+    private String confirmer;
+
+    /** 纭鏃堕棿 */
+    @Excel(name = "纭鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date confirmTime;
+
+    /** 纭鎰忚 */
+    @Excel(name = "纭鎰忚", width = 15)
+    private String confirmComment;
+
+    /** 璁㈠崟鐘舵�� */
+    @Excel(name = "璁㈠崟鐘舵��", width = 15)
+    private String orderStatus;
+
+    // 鏄庣粏闆嗗悎
+    @ExcelCollection(name = "鍏ュ簱鏄庣粏")
+    private List<CuttingInboundDetail> detailList;
+
+    // getter鍜宻etter鏂规硶...
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public java.util.Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(java.util.Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
+    public String getReceiveComment() {
+        return receiveComment;
+    }
+
+    public void setReceiveComment(String receiveComment) {
+        this.receiveComment = receiveComment;
+    }
+
+    public String getConfirmer() {
+        return confirmer;
+    }
+
+    public void setConfirmer(String confirmer) {
+        this.confirmer = confirmer;
+    }
+
+    public java.util.Date getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(java.util.Date confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
+    public String getConfirmComment() {
+        return confirmComment;
+    }
+
+    public void setConfirmComment(String confirmComment) {
+        this.confirmComment = confirmComment;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public List<CuttingInboundDetail> getDetailList() {
+        return detailList;
+    }
+
+    public void setDetailList(List<CuttingInboundDetail> detailList) {
+        this.detailList = detailList;
+    }
+}

--
Gitblit v1.9.3