From 6ecf7171775a04bbcb52c9943bcafce699c837a7 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 25 六月 2025 11:11:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingPercentProvinceDto.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingPercentProvinceDto.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingPercentProvinceDto.java index 08b4f8c..40cd4a7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingPercentProvinceDto.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingPercentProvinceDto.java @@ -4,10 +4,14 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; @Data public class ChargingPercentProvinceDto { - String provinceCode; - LocalDate date1; - LocalDate date2; + private String provinceCode; + private LocalDate date1; + private LocalDate date2; + private Set<Integer> siteIds; + private String tripartitePlatformName; } -- Gitblit v1.7.1