Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java

@@ -1,38 +0,0 @@
-package com.epmet.dataaggre.dto.datastats.form;
-
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description 对外接口-查询下级话题和小组数-接口入参
- * @Auth sun
- */
-@Data
-public class SubTopicAndGroupFormDTO implements Serializable {
-
-    private static final long serialVersionUID = -3381286960911634231L;
-    /**
-     * 当前组织id；从组织树取
-     */
-    @NotBlank(message = "组织ID不能为空", groups = SubTopicAndGroupFormDTO.Agency.class)
-    private String agencyId;
-    /**
-     * 当前组织级别；从组织树取
-     * 机关级别（社区级：community，
-     * 乡（镇、街道）级:street,
-     * 区县级: district,
-     * 市级: city
-     * 省级:province）
-     */
-    @NotBlank(message = "组织级别不能为空", groups = SubTopicAndGroupFormDTO.Agency.class)
-    private String agencyLevel;
-    /**
-     * 日维度Id【yyyyMMdd eg：20210808，默认前一天】
-     */
-    private String dateId;
-    public interface Agency extends CustomerClientShowGroup{}
-
-}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java

@@ -1,38 +0,0 @@
-package com.epmet.dataaggre.dto.datastats.form;
-
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description 对外接口-查询下级用户党员数-接口入参
- * @Auth sun
- */
-@Data
-public class SubUserTotalFormDTO implements Serializable {
-
-    private static final long serialVersionUID = -3381286960911634231L;
-    /**
-     * 当前组织id；从组织树取
-     */
-    @NotBlank(message = "组织ID不能为空", groups = SubUserTotalFormDTO.Agency.class)
-    private String agencyId;
-    /**
-     * 当前组织级别；从组织树取
-     * 机关级别（社区级：community，
-     * 乡（镇、街道）级:street,
-     * 区县级: district,
-     * 市级: city
-     * 省级:province）
-     */
-    @NotBlank(message = "组织级别不能为空", groups = SubUserTotalFormDTO.Agency.class)
-    private String agencyLevel;
-    /**
-     * 日维度Id【yyyyMMdd eg：20210808，默认前一天】
-     */
-    private String dateId;
-    public interface Agency extends CustomerClientShowGroup{}
-
-}