From 741b189ac80b73a5e195986e2d1589a422fdc497 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 28 Oct 2024 16:45:45 +0800
Subject: [PATCH] 1

---
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java      | 1 -
 .../scm/api/scmcollectionrebate/ScmCollectionRebateVo.java     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 8744a77d72..c8f6069570 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -395,7 +395,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
                 scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
                 scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
-                scmCollectionRebateDto.setUploadDate("");
                 scmCollectionRebateDto.setManufaSaleChannel("");
                 scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
                 scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
index f72d1ad4a8..e2e3ecbc9f 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
@@ -107,8 +107,7 @@ public class ScmCollectionRebateVo implements Vo {
     @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
     @ApiModelProperty("上传日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date uploadDate; // 上传日期
+    private String uploadDate; // 上传日期
     @ApiModelProperty("上传金额")
     private BigDecimal uploadMoney; // 上传金额
     @ApiModelProperty("调整金额")