From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet
---
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 6edc5f0..23fe6b4 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -1,7 +1,10 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.vo.FileVo;
+import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.InvoiceLedgerFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,6 +12,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -40,12 +44,30 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate invoiceDate;
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
+
@ApiModelProperty(value = "寮�绁ㄥ彴璐d")
private Integer invoiceLedgerId;
@ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
private String invoiceFileName;
+ private List<InvoiceLedgerFile> commonFiles;
+
private String searchText;
+ private Boolean status;
+
+ private String projectName;
+
+
+ @TableField(exist = false)
+ private String createTimeStart;
+ @TableField(exist = false)
+ private String createTimeEnd;
+
+
}
--
Gitblit v1.9.3