From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformWorkDataVO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformWorkDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformWorkDataVO.java
index 49416df..7fbcb46 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformWorkDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformWorkDataVO.java
@@ -17,7 +17,13 @@
@ApiModelProperty(value = "鏈堝彴鍚嶇О")
private String platformName;
+ @ApiModelProperty(value = "鏈堝彴涓婚敭")
+ private Integer platformId;
+ @ApiModelProperty(value = "鏈堝彴鎺掑簭")
+ private Integer platformSort;
+ @ApiModelProperty(value = "鏈堝彴缂栫爜")
+ private String platformCode;
@ApiModelProperty(value = "杞︾墝鍙�")
private String carNo;
@@ -28,12 +34,14 @@
private Integer workType;
@ApiModelProperty(value = "浣滀笟鏃堕暱 鍗曚綅 鍒嗛挓")
- private Integer workTime;
+ private Long workTime;
@ApiModelProperty(value = "棰勮瀹屾垚鏃堕棿 鍗曚綅锛氭椂闂存埑")
private Long finishTime;
+ @ApiModelProperty(value = "棰勮瀹屾垚鏃堕棿 鏍煎紡HH锛歮m")
+ private String finishTimeStr;
- @ApiModelProperty(value = "鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂")
+ @ApiModelProperty(value = "鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂;3=鍙彿涓�")
private Integer status;
}
--
Gitblit v1.9.3