From aab9f74b97df038154d507b6d17b6f96a8337efc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 03 七月 2025 13:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 2ebf084..f1deeab 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,12 +1,15 @@
package com.ruoyi.sales.pojo;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -48,6 +51,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
/**
@@ -70,8 +74,12 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
private String entryPerson;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "褰曞叆浜�")
+ @Excel(name = "褰曞叆浜�")
+ private String entryPersonName;
/**
* 澶囨敞
@@ -93,5 +101,19 @@
*/
@Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ private BigDecimal noInvoiceAmountTotal;
+
+ @ApiModelProperty(value = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ private BigDecimal invoiceTotal;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
}
--
Gitblit v1.9.3