From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java
index 1a7cd0c..29609b2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "服务订单数")
private Integer serviceTotal;
+ @ApiModelProperty(value = "单品数量")
+ private Integer itemTotal;
+
@ApiModelProperty(value = "总订单金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@@ -69,6 +72,10 @@
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal serviceMoney;
+ @ApiModelProperty(value = "单品金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal itemMoney;
+
@ApiModelProperty(value = "订单分布日期")
private String[] orderTotalKey;
@@ -76,7 +83,6 @@
private Integer[] orderTotalValue;
@ApiModelProperty(value = "订单分布金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal[] orderMoneyValue;
@ApiModelProperty(value = "销售占比数量")
--
Gitblit v1.7.1