From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态(回款完成,未完成) 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制,过时后状态改为已过期

---
 src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java |   28 ++++++----------------------
 1 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
index 33fb9b3..7963758 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -10,6 +10,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -20,24 +21,6 @@
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
-
-    @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
-    private Integer salesLedgerId;
-
-    @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
-    private String salesContractNo;
-
-    @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "鍙戠エ鍙�")
-    private String invoiceNo;
-
-    @ApiModelProperty(value = "鍙戠エ閲戦")
-    private BigDecimal invoiceAmount;
-
-    @ApiModelProperty(value = "绋庣巼")
-    private BigDecimal taxRate;
 
     @ApiModelProperty(value = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
     private String receiptPaymentType;
@@ -52,12 +35,13 @@
     private Integer invoiceLedgerId;
 
     @ApiModelProperty(value = "鏉ユ鏃ユ湡")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime receiptPaymentDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate receiptPaymentDate;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@@ -74,6 +58,6 @@
 
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
-    private Integer tenantId;
+    private Long tenantId;
 
 }

--
Gitblit v1.9.3