diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java
new file mode 100644
index 0000000..da5de59
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党组织表 党组织表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-06
+ */
+@Data
+public class PartyOrgDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 党组织名称
+ */
+ private String partyOrgName;
+
+ /**
+ * 党组织介绍
+ */
+ private String introduction;
+
+ /**
+ * 两委干部
+ */
+ private String twoCommittees;
+
+ /**
+ * 党员数量
+ */
+ private Integer partyMemberNum;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 所属组织名称
+ */
+ private String deptName;
+
+ /**
+ * 所属组织ID
+ */
+ private String deptId;
+
+ /**
+ * 党组织类型编码
+ */
+ private String typeCode;
+
+ /**
+ * 父所有部门ID
+ */
+ private String parentDeptIds;
+
+ /**
+ * 父所有部门名称
+ */
+ private String parentDeptNames;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门名称
+ */
+ private String allDeptNames;
+
+ /**
+ * 删除标识 0-否，1-是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 所有部门ID，用于回显修改页面的下拉选项
+ */
+ private String[] allDeptIdArr;
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java
new file mode 100644
index 0000000..324130a
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党组织类型表 党组织类型表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-06
+ */
+@Data
+public class PartyOrgTypeDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 类型名称
+ */
+ private String typeName;
+
+ /**
+ * 类型编码
+ */
+ private String typeCode;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
+ * 启用标识 0-否，1-是
+ */
+ private String enable;
+
+ /**
+ * 删除标识 0-否，1-是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeSelectDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeSelectDTO.java
new file mode 100644
index 0000000..f240a93
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeSelectDTO.java
@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @auther: zhangyong
+ * @date: 2021-08-06 15:25
+ */
+@Data
+public class PartyOrgTypeSelectDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 类型名称
+ */
+ private String tagName;
+
+ /**
+ * 类型编码
+ */
+ private String tagValue;
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java
new file mode 100644
index 0000000..6b02c89
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java
@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-admin-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-11 15:43
+ **/
+@Data
+public class RoleModuleRealationDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色id
+ */
+ private Long id;
+
+ /**
+ * 内容栏目ID列表
+ */
+ private List moduleMenuIdList;
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
index 3817152..523b9c1 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
@@ -87,4 +87,9 @@ public class SysRoleDTO implements Serializable {
* 吹哨部门id列表
*/
private List whistleDeptIdList;
+
+ /**
+ * 内容栏目ID列表
+ */
+ private List moduleMenuIdList;
}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
new file mode 100644
index 0000000..2efabca
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
@@ -0,0 +1,16 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 栏目节点
+ *
+ */
+@Data
+public class ModuleOption {
+
+ private List moduleOptions;
+
+}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java
new file mode 100644
index 0000000..7a8ec90
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-news-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-10 14:49
+ **/
+@Data
+public class ModuleOptionDTO extends TreeNode implements Serializable {
+
+ private Long id;
+
+ private Long pid;
+
+ /**
+ * 栏目名称
+ */
+ private String label;
+
+ /**
+ *栏目id
+ */
+ private Long value;
+
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java
new file mode 100644
index 0000000..864a1d9
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java
@@ -0,0 +1,63 @@
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-news-yushan
+ * @description: 栏目管理树
+ * @author: wangtong
+ * @create: 2021-08-09 16:18
+ **/
+@Data
+public class ModuleTypeCategoryDTO extends TreeNode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @Null(message = "{id.null}", groups = AddGroup.class)
+ @NotNull(message = "{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ /**
+ * 上级分类ID
+ */
+ @NotNull(message = "{sysdept.pid.require}", groups = DefaultGroup.class)
+ private Long pid;
+
+ /**
+ * 分类名称
+ */
+ @NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
+ private String typeName;
+
+
+ /**
+ * 分类编码
+ */
+ private String typeCode;
+
+ /**
+ * 排序
+ */
+ @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+ private Integer sort;
+
+ private String parentName;
+
+ private String value;
+
+ private String label;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
new file mode 100644
index 0000000..1146981
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 模块类别管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-10
+ */
+@Data
+public class ModuleTypeDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private Long id;
+
+ /**
+ * 上级ID
+ */
+ private Long pid;
+
+ /**
+ * 所有上级ID 逗号分隔
+ */
+ private String pids;
+
+ /**
+ * 类别名称
+ */
+ private String typeName;
+
+ /**
+ * 类别编码
+ */
+ private String typeCode;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
+ * 启用标识 0-否，1-是
+ */
+ private String bannerFlag;
+
+ /**
+ * 删除标识 0：未删除 1：删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建者
+ */
+ private Long creator;
+
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+
+ /**
+ * 更新者
+ */
+ private Long updater;
+
+ /**
+ * 更新时间
+ */
+ private Date updateDate;
+
+ private String parentName;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
index c9dd55e..bbbd9a2 100644
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
@@ -17,12 +17,12 @@
package com.elink.esua.epdc.dto;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import lombok.Data;
-
/**
* 通知表
@@ -140,4 +140,26 @@ public class NoticeDTO implements Serializable {
*/
private String extendFlag;
+ /**
+ * 栏目id
+ */
+ private String typeId;
+
+ /**
+ * 所有栏目id
+ */
+ private List allTypeId;
+
+ /**
+ * 置顶标识 0-否，1-是
+ */
+ private String topFlag;
+
+ /**
+ * 上下架状态 0-下架，1-上架
+ */
+ private String noticeUpDownState;
+
+ private String typeName;
+
}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java
new file mode 100644
index 0000000..d38d689
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 角色栏目关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-09
+ */
+@Data
+public class RoleModuleDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+
+ /**
+ * 栏目ID
+ */
+ private Long moduleId;
+
+ /**
+ * 删除标识 0-否，1-是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file