From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
index 7f13eac..ecdcdfb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
@@ -49,7 +49,7 @@
private String time;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty("服务人员id")
@@ -68,11 +68,11 @@
private Integer state;
@ApiModelProperty("师傅到达预约地点时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单完成时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@ApiModelProperty("订单补贴金额")
@@ -85,7 +85,7 @@
private Integer withdrawalState;
@ApiModelProperty("提现申请时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date withdrawalTime;
@ApiModelProperty("详细地址")
--
Gitblit v1.7.1