From 64bce2eb858b95e7851b6c05fa34938dbfb701e6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 五月 2024 16:49:13 +0800
Subject: [PATCH] 修改因算税时间一税，导致获取历史数据不准的问题（加上xh字段） 个税汇总里的功能，删除时一个fund时，将相应的fund的“算税时间” 和"funddetail"表里的“算税时间”、“序号”置空
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
index 3d3a5f0..fb08ee6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
@@ -98,8 +98,8 @@
* 璐圭敤褰曞叆鏃堕棿
*/
@ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date organtime;
/**
@@ -171,7 +171,14 @@
*/
@ApiModelProperty("绁ㄦ嵁闄勪欢闆嗗悎")
@Excel(name = "绁ㄦ嵁闄勪欢闆嗗悎")
- private List<String> annexFilesList;
+ private List annexFilesList;
+
+ /**
+ * 鎺ユ敹鏃ユ湡
+ */
+ @ApiModelProperty("鎺ユ敹鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiveTime;
}
--
Gitblit v1.9.3