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-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeRecordVO.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeRecordVO.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeRecordVO.java
index 1f6fd4f..b195cc5 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeRecordVO.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeRecordVO.java
@@ -1,5 +1,7 @@
package com.ruoyi.admin.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,15 +19,29 @@
public class OrderByServeRecordVO {
@ApiModelProperty("接单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptOrderTime;
- @ApiModelProperty("到达时间")
- private Date reachTime;
+ @ApiModelProperty("上门时间")
+ private String reachTime;
@ApiModelProperty("路线经纬度集合")
private List<String> coordinate;
+ @ApiModelProperty("路线标点经纬度集合")
+ private List<String> marker;
+
@ApiModelProperty("现场照片集合")
private List<String> photo;
+ @ApiModelProperty("现场照片(多张照片 ','隔开)")
+ @TableField("card_pic")
+ private String cardPic;
+ @ApiModelProperty("现场照片(多张照片 ','隔开)")
+ @TableField("machine_pic")
+ private String machinePic;
+ @ApiModelProperty("现场照片(多张照片 ','隔开)")
+ @TableField("paper_pic")
+ private String paperPic;
+
}
--
Gitblit v1.7.1