From 136a5cf39b311bc1374f4a611e6252d69831726c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 12:18:45 +0800
Subject: [PATCH] finish service order detail
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailItemVo.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailItemVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailItemVo.java
index ddccddf..18220b4 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailItemVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailItemVo.java
@@ -1,5 +1,7 @@
package com.matrix.system.app.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,9 +24,11 @@
@ApiModelProperty(value = "价格")
private BigDecimal price;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@ApiModelProperty(value = "服务开始时间")
- private Date startTime;
+ private Date beginTime;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@ApiModelProperty(value = "服务结束时间")
private Date endTime;
@@ -61,12 +65,12 @@
this.price = price;
}
- public Date getStartTime() {
- return startTime;
+ public Date getBeginTime() {
+ return beginTime;
}
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
+ public void setBeginTime(Date beginTime) {
+ this.beginTime = beginTime;
}
public Date getEndTime() {
--
Gitblit v1.9.1