From 0cbb1c4bc98c29e5ca73961d040a0ec1ca4333ac Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 22 四月 2025 09:07:53 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev --- 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