From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java
index 5d6df4a..29445d2 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java
@@ -17,6 +17,8 @@
@ApiModelProperty(value = "用户手机号")
private String phone;
+ @ApiModelProperty(value = "用户id")
+ private Long appUserId;
@ApiModelProperty(value = "参与类型 优惠券 会员抵扣 会员活动 赠送会员")
private String type;
@@ -35,7 +37,7 @@
@ApiModelProperty(value = "实付")
private BigDecimal paymentAmount;
@ApiModelProperty(value = "消费时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime time;
@ApiModelProperty(value = "总计优惠")
private BigDecimal total;
--
Gitblit v1.7.1