From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java
index b20cf25..d249077 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java
@@ -53,15 +53,15 @@
private Integer state;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@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("订单补贴金额")
@@ -72,6 +72,11 @@
@ApiModelProperty("家电照片")
private String photo;
+ @ApiModelProperty("师傅照片")
+ private String workPic;
+
+ @ApiModelProperty("是否评价(0:未评价,1:已评价)")
+ private Integer isEvaluate;
public OrderDetailVO(Order order) {
this.orderId = order.getId();
@@ -91,5 +96,6 @@
this.completeTime = order.getCompleteTime();
this.subsidy = order.getSubsidy();
this.address = order.getAddress();
+ this.isEvaluate = order.getIsEvaluate();
}
}
--
Gitblit v1.7.1