From 1d3d48696168c4455836bbd19155290fb32dc907 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 20 Dec 2024 10:01:02 +0800
Subject: [PATCH] =?UTF-8?q?pom=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bonus-common-biz/pom.xml                                 | 2 +-
 bonus-modules/bonus-material-mall/pom.xml                | 4 ++--
 .../com/bonus/material/order/domain/OrderDetailDto.java  | 9 +++++++--
 bonus-modules/pom.xml                                    | 2 +-
 pom.xml                                                  | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bonus-common-biz/pom.xml b/bonus-common-biz/pom.xml
index 4a6dedb..efa8a0b 100644
--- a/bonus-common-biz/pom.xml
+++ b/bonus-common-biz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
+        <version>24.12.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bonus-modules/bonus-material-mall/pom.xml b/bonus-modules/bonus-material-mall/pom.xml
index 49ad73d..10199f1 100644
--- a/bonus-modules/bonus-material-mall/pom.xml
+++ b/bonus-modules/bonus-material-mall/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-modules</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
+        <version>24.12.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.bonus</groupId>
             <artifactId>bonus-common-biz</artifactId>
-            <version>24.11.0-SNAPSHOT</version>
+            <version>24.12.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
index 184b38f..4f0e61f 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
@@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -54,11 +55,13 @@ public class OrderDetailDto {
     private String typeName;
 
     @ApiModelProperty(value = "租期开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date rentBeginTime;
 
     @ApiModelProperty(value = "租期结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date rentEndTime;
 
     @ApiModelProperty(value = "天数")
@@ -90,10 +93,12 @@ public class OrderDetailDto {
 
     @ApiModelProperty(value = "创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @ApiModelProperty(value = "修改日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     @ApiModelProperty(value = "出库人")
diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml
index c300b13..918b184 100644
--- a/bonus-modules/pom.xml
+++ b/bonus-modules/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
+        <version>24.12.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 848801e..bdfa656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.bonus</groupId>
     <artifactId>bonus</artifactId>
-    <version>24.11.0-SNAPSHOT</version>
+    <version>24.12.0-SNAPSHOT</version>
 
     <name>bonus</name>
     <url>http://www.ahbonus.cn</url>
     <description>博诺思微服务系统</description>
 
     <properties>
-        <bonus.version>24.11.0-SNAPSHOT</bonus.version>
+        <bonus.version>24.12.0-SNAPSHOT</bonus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>