From 1cf92e13371b55c4449ccb48b264eea547eccb86 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 10:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
index c51e642..ea22453 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -1,4 +1,53 @@
 package com.ruoyi.sales.dto;
 
-public class SalesLedgerProductDto {
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import lombok.Data;
+
+
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class SalesLedgerProductDto extends SalesLedgerProduct {
+
+    /**
+     * 閲囪喘鍚堝悓鍙�
+     */
+    @Excel(name = "閲囪喘鍚堝悓鍙�")
+    private String purchaseContractNumber;
+    /**
+     * 閿�鍞悎鍚屽彿
+     */
+    private String salesContractNo;
+    /**
+     * 瀹㈡埛鍚堝悓鍙�
+     */
+    private String customerContractNo;
+    /**
+     * 椤圭洰鍚嶇О
+     */
+    private String projectName;
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    private String customerName;
+    /**
+     * 鐘舵��
+     */
+    private String statusName;
+    /**
+     * true:涓嶆樉绀哄緟浠樻锛屽洖娆句负0鐨勬暟鎹�
+     */
+    private Boolean status;
+
+    /**
+     * 渚涘簲鍟嗗悕绉�
+     */
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
+    private String supplierName;
+
 }

--
Gitblit v1.9.3