From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
index 5271477..63f1660 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
@@ -1,11 +1,13 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.api.domain.vo.MerCouponGoodsListVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @ClassName MerMemberOrderVo
@@ -55,14 +57,17 @@
@ApiModelProperty(value="未收金额")
private BigDecimal unPaidMoney;
-
- @ApiModelProperty(value="收款时间")
+
+ @ApiModelProperty(value = "收款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date receiveMoneyTime;
-
- @ApiModelProperty(value="收款金额")
+
+ @ApiModelProperty(value = "收款金额")
private BigDecimal thisReceiveMoney;
-
- @ApiModelProperty(value="收款方式")
+
+ @ApiModelProperty(value = "收款方式")
private String thisReceiveType;
+
+ @ApiModelProperty(value = "商品信息")
+ private List<MerCouponGoodsListVo> goodsList;
}
--
Gitblit v1.7.1