From e38dbee7e43f6af65c7e9307d936a1c48e4bb539 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopPointStatistics.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopPointStatistics.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopPointStatistics.java
index 79f8376..9d34224 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopPointStatistics.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopPointStatistics.java
@@ -7,6 +7,7 @@
import lombok.Data;
import java.util.List;
+import java.util.Map;
@Data
@ApiModel("门店积分统计")
@@ -37,4 +38,7 @@
private Integer subShopCommissionPoint;
private IPage<ShopPoint> shopPointIPage;
+
+ @ApiModelProperty("折线图数据")
+ private Map<String, Object> brokenLine;
}
--
Gitblit v1.7.1