From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/EvaluateOrderInfoVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/EvaluateOrderInfoVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/EvaluateOrderInfoVO.java
index 5c281c3..96b40bd 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/EvaluateOrderInfoVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/EvaluateOrderInfoVO.java
@@ -36,10 +36,14 @@
private String serverPhone;
@ApiModelProperty("订单完成时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@ApiModelProperty("回收服务id")
private Integer serveId;
+ @ApiModelProperty("预约地址")
+ private String reservationAddress;
+ @ApiModelProperty("详细地址")
+ private String address;
}
--
Gitblit v1.7.1