From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderStaticsVO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderStaticsVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderStaticsVO.java
index f6e0475..8f06c19 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderStaticsVO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderStaticsVO.java
@@ -16,16 +16,16 @@
private static final long serialVersionUID = -6511810306263817540L;
@ApiModelProperty("商城订单统计-订单总数")
- private Integer mallOrderTotalCount;
+ private Long mallOrderTotalCount;
@ApiModelProperty("商城订单统计-商城订单")
- private Integer mallOrderCount;
+ private Long mallOrderCount;
@ApiModelProperty("商城订单统计-秒杀订单")
- private Integer seckillOrderCount;
+ private Long seckillOrderCount;
@ApiModelProperty("商城订单统计-团购订单")
- private Integer groupPurchaseOrderCount;
+ private Long groupPurchaseOrderCount;
@ApiModelProperty("商城订单统计-订单总金额")
private BigDecimal mallOrderTotalAmount;
@@ -40,13 +40,13 @@
private BigDecimal groupPurchaseTotalAmount;
@ApiModelProperty("拍卖订单统计-订单总数")
- private Integer auctionOrderTotalCount;
+ private Long auctionOrderTotalCount;
@ApiModelProperty("拍卖订单统计-拍卖商品订单")
- private Integer auctionGoodsOrderCount;
+ private Long auctionGoodsOrderCount;
@ApiModelProperty("拍卖订单统计-拍卖场订单")
- private Integer auctionSalesroomOrderCount;
+ private Long auctionSalesroomOrderCount;
@ApiModelProperty("拍卖订单统计-订单总金额")
private BigDecimal auctionOrderTotalAmount;
--
Gitblit v1.7.1