From 0764ab507f1b21fb8eadd7bc294ebf28aa592c24 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 31 Jan 2021 07:21:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
index 172951c..205bcd7 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
@@ -19,6 +19,9 @@
@ApiModelProperty(value = "订单ID")
private String orderId;
+ @ApiModelProperty(value = "会员ID")
+ private String vipId;
+
@ApiModelProperty(value = "会员姓名")
private String vipName;
@@ -55,10 +58,17 @@
@ApiModelProperty(value = "欠款")
private BigDecimal arrears;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
@ApiModelProperty(value = "下单时间")
private Date orderTime;
+ public String getVipId() {
+ return vipId;
+ }
+
+ public void setVipId(String vipId) {
+ this.vipId = vipId;
+ }
public Date getOrderTime() {
return orderTime;
--
Gitblit v1.9.1