diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java index 7fc2af1..2ca7057 100644 --- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java @@ -20,6 +20,17 @@ public class EpdcBannerListFromDTO implements Serializable { */ @NotBlank(message = "banner位置不能为空") private String position; + + + /** + * 文章/新闻 所属功能版块 + */ + @NotBlank(message = "版块编码不能为空") + private String sectionCode; + + + // ---------------- 冗余字段 + /** * 网格ID */ diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java deleted file mode 100644 index 82d7411..0000000 --- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.dto.epdc.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * 新闻列表查询参数 - * - * @author work@yujt.net.cn - * @date 2019/9/7 11:19 - */ -@Data -public class EpdcNewsListByCategoryFromDTO extends EpdcNewsListFromDTO implements Serializable { - - private static final long serialVersionUID = -6782308933818246525L; - - /** - * 新闻类别编码 - */ - private String categoryCode; - -} diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java index 97eaebf..0965b74 100644 --- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java @@ -17,12 +17,6 @@ public class EpdcNewsListFromDTO implements Serializable { private static final long serialVersionUID = 7558948992362027659L; - /** - * 用户所属网格ID - */ - @NotNull(message = "用户网格ID不能为空") - private Long deptId; - /** * 页码 */ @@ -41,4 +35,24 @@ public class EpdcNewsListFromDTO implements Serializable { @NotBlank(message = "时间戳不能为空") private String timestamp; + /** + * 文章/新闻类别编码 + *