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-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeRecordVO.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 90cd70e..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,6 @@
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;
@@ -18,17 +19,29 @@
public class OrderByServeRecordVO {
@ApiModelProperty("接单时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptOrderTime;
- @ApiModelProperty("到达时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
- 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