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 @@
com.bonus
bonus
- 24.11.0-SNAPSHOT
+ 24.12.0-SNAPSHOT
4.0.0
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 @@
com.bonus
bonus-modules
- 24.11.0-SNAPSHOT
+ 24.12.0-SNAPSHOT
4.0.0
@@ -101,7 +101,7 @@
com.bonus
bonus-common-biz
- 24.11.0-SNAPSHOT
+ 24.12.0-SNAPSHOT
compile
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 152e924..e0538a1 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 = "订单原始天数")
@@ -93,10 +96,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 @@
com.bonus
bonus
- 24.11.0-SNAPSHOT
+ 24.12.0-SNAPSHOT
4.0.0
diff --git a/pom.xml b/pom.xml
index 848801e..bdfa656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.bonus
bonus
- 24.11.0-SNAPSHOT
+ 24.12.0-SNAPSHOT
bonus
http://www.ahbonus.cn
博诺思微服务系统
- 24.11.0-SNAPSHOT
+ 24.12.0-SNAPSHOT
UTF-8
UTF-8
1.8