From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java
index 42411e1..b2bf08c 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java
@@ -1,6 +1,5 @@
package com.ruoyi.sales.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +9,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.Date;
/**
* @author :yys
@@ -31,7 +29,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鐧昏鏃ユ湡",width = 30,dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "鐧昏鏃ユ湡")
- private LocalDateTime createTime;
+ private LocalDateTime invoiceDate;
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
@@ -39,7 +37,7 @@
@ApiModelProperty(value = "鍥炴閲戦")
@Excel(name = "鍥炴閲戦")
- private BigDecimal receiptPaymentAmount;
+ private BigDecimal receiptPaymentAmountTotal;
@ApiModelProperty(value = "椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О")
@@ -56,7 +54,7 @@
@ApiModelProperty(value = "鏉ユ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏉ユ鏃ユ湡",width = 30,dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鍥炴鏃ユ湡",width = 30,dateFormat = "yyyy-MM-dd")
private LocalDate receiptPaymentDate;
}
--
Gitblit v1.9.3