From a508511946c4b2c8aed6cf6eedf0df7659807a06 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 30 六月 2025 10:37:10 +0800
Subject: [PATCH] 2025-06-30 bug修改
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 3f57720..a3f2f1d 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -16,14 +17,25 @@
private String salesContractNo;
private String customerContractNo;
private String projectName;
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date entryDate;
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ private String entryDate;
private String salesman;
private Long customerId;
private String customerName;
private String entryPerson;
private String remarks;
private String attachmentMaterials;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ @TableField(exist = false)
+ private String invoiceNo;
+ @TableField(exist = false)
+ private String createUser;
+
+
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
private List<String> tempFileIds;
@@ -33,5 +45,8 @@
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
- private Integer status;
+ private Boolean status;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
}
--
Gitblit v1.9.3