From 086be7eae50e48ad554fd8a3f4cb1e333d587595 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 27 一月 2026 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/system/vo/BusinessDataCountVO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/system/vo/BusinessDataCountVO.java b/server/dmmall_service/src/main/java/com/doumee/dao/system/vo/BusinessDataCountVO.java
index 1b29b5a..c769b0c 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/system/vo/BusinessDataCountVO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/system/vo/BusinessDataCountVO.java
@@ -22,11 +22,11 @@
@ApiModelProperty(value = "缁熻缁村害鍚嶇О")
private String name;
@ApiModelProperty(value = "缁熻鍒楄〃鏁版嵁")
- private List<CountDataVO> dataList;
+ private List<Long> dataList;
+ @ApiModelProperty(value = "妯酱")
+ private List<String> dateStrList;
@ApiModelProperty(value = "缁熻鍒楄〃鏁版嵁2")
- private List<CountDataVO> dataList2;
+ private List<BigDecimal> dataList2;
@ApiModelProperty(value = "缁熻鍒楄〃鏁版嵁鍒嗙被2")
- private List<String> cateList;
- @ApiModelProperty(value = "缁熻鍒楄〃鏁版嵁3")
- private List<BigDecimal[]> numList;
+ private List<CountDataVO> cateList;
}
--
Gitblit v1.9.3