From 8b65a5c9e392f46eeea7cfda9647d59aee4ec81a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 二月 2025 11:40:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
index 38750a2..95e5a65 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
@@ -54,12 +54,12 @@
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @ExcelColumn(name="寮�濮嬫椂闂�")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     @ExcelColumn(name="缁撴潫鏃堕棿")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     @ApiModelProperty(value = "浼樺厛绾э紙鍗囧簭锛�", example = "1")

--
Gitblit v1.9.3