From d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 18:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/UserDataCountRequest.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/UserDataCountRequest.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/UserDataCountRequest.java
index 5168a62..d113eba 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/UserDataCountRequest.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/UserDataCountRequest.java
@@ -16,11 +16,12 @@
@ApiModel(value = "userDataCountRequest对象", description = "用户数据统计请求参数")
public class UserDataCountRequest {
- @ApiModelProperty("所选城市id集合")
- private List<String> cityIdList;
+ @ApiModelProperty("所选城市集合")
+ private List<String> cityList;
@ApiModelProperty("统计类型(月度:month;季度:quarter;年度:year)")
@NotBlank(message = "请选择:统计类型！")
private String countType;
+ private List<String> siteIds;
}
--
Gitblit v1.7.1