From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 10:20:08 +0800
Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询，不显示待回款为0，默认为打钩。 销售管理】-【回款流水】，增加合同号、项目名称列查询，增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】，增加导出功能
---
src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java | 31 +++----------------------------
1 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index 08f4f90..1a7cf45 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -6,6 +6,7 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* Entity鍩虹被
@@ -17,6 +18,7 @@
private static final long serialVersionUID = 1L;
/** 鎼滅储鍊� */
+ @JsonIgnore
private String searchValue;
/** 鍒涘缓鑰� */
@@ -36,15 +38,8 @@
/** 澶囨敞 */
private String remark;
- /** 寮�濮嬫椂闂� */
- @JsonIgnore
- private String beginTime;
-
- /** 缁撴潫鏃堕棿 */
- @JsonIgnore
- private String endTime;
-
/** 璇锋眰鍙傛暟 */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public String getSearchValue()
@@ -105,26 +100,6 @@
public void setRemark(String remark)
{
this.remark = remark;
- }
-
- public String getBeginTime()
- {
- return beginTime;
- }
-
- public void setBeginTime(String beginTime)
- {
- this.beginTime = beginTime;
- }
-
- public String getEndTime()
- {
- return endTime;
- }
-
- public void setEndTime(String endTime)
- {
- this.endTime = endTime;
}
public Map<String, Object> getParams()
--
Gitblit v1.9.3