From 0ab1b864458f36b294933112824b10b13770915e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 21:12:43 +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/MgtTotalActivityTotalVo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
index 7d29ede..e19d04a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
@@ -1,7 +1,7 @@
 package com.ruoyi.order.domain.vo;
 
 import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -64,7 +64,7 @@
     private BigDecimal[] orderMoneyValue;
 
     @ApiModelProperty(value = "商品类型数量")
-    private List<MgtMapTotalVo> goodsTypeTotalList;
+    private List<MgtMapIntTotalVo> goodsTypeTotalList;
 
     @ApiModelProperty(value = "商品类型金额")
     private List<MgtMapBigTotalVo> goodsTypeMoneyList;

--
Gitblit v1.7.1