From 9658e5ca43e617c68c54d7dd7797f873e55311c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 21:26:39 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
index ff23b5a..cc47944 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -22,6 +23,9 @@
@ApiModelProperty("订单编号")
private String orderNo;
+ @ApiModelProperty("订单状态")
+ private Integer orderStatus;
+
@ApiModelProperty(value = "商品总价")
private BigDecimal orderGoodsMoney;
@@ -39,4 +43,7 @@
@ApiModelProperty("订单未支付金额")
private BigDecimal unPaidMoney;
+
+ @ApiModelProperty("创建时间")
+ private Date createTime;
}
--
Gitblit v1.7.1