From f975b6d0832b447654aaf2372ce72f71ebb7f095 Mon Sep 17 00:00:00 2001
From: chenye <chenye0811@qq.com>
Date: 星期二, 11 七月 2023 11:11:55 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
index 77c99ca..f179593 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -48,12 +50,15 @@
private BigDecimal payMoney;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
@ApiModelProperty("核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useTime;
@ApiModelProperty("订单备注")
@@ -64,4 +69,7 @@
@ApiModelProperty(value = "用户电话")
private String userMobile;
+
+ @ApiModelProperty("结清标记0否1是")
+ private Integer closeFlag;
}
--
Gitblit v1.7.1