From ae3cd0dd4764559f98e1700faf889f5eddd8ac2b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期日, 28 九月 2025 16:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
index b890a00..59c7a9d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/EstimatedReceivable.java
@@ -56,6 +56,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("order_date")
private Date orderDate;
+ private String orderDateBegin;
+ private String orderDateEnd;
/** 璐圭敤鍚嶇О */
@@ -155,5 +157,13 @@
@TableField("deleted")
private Integer deleted;
+ public void setOrderDateBegin(String orderDateBegin) {
+ this.orderDateBegin = orderDateBegin==null? null :orderDateBegin+ " 00:00:00";
+ }
+
+ public void setOrderDateEnd(String orderDateEnd) {
+ this.orderDateEnd = orderDateEnd==null?null:orderDateEnd+ " 23:59:59";
+ }
+
}
--
Gitblit v1.8.0