Merge remote-tracking branch 'origin/master'

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMemberListFromDTO.java

@@ -27,4 +27,9 @@ public class AppMemberListFromDTO implements Serializable {
 
     private Long deptId;
 
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
 }

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/GridMemberCategoryDTO.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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-11-04
+ */
+@Data
+public class GridMemberCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标识号
+     */
+	private Long id;
+
+    /**
+     * 类别名称
+     */
+	private String typeName;
+
+    /**
+     * 类别编码
+     */
+	private String typeCode;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 图片地址
+     */
+	private String imgUrl;
+
+    /**
+     * 启用标识 0-启用，1-未启用
+     */
+	private String bannerFlag;
+
+    /**
+     * 删除标识  0：未删除    1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+	private Long creator;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+    /**
+     * 更新者
+     */
+	private Long updater;
+
+    /**
+     * 更新时间
+     */
+	private Date updateDate;
+
+}

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/GridMemberDTO.java

@@ -74,6 +74,11 @@ public class GridMemberDTO implements Serializable {
      */
 	private String mobile;
 
+    /**
+     * 类别编码
+     */
+    private String categoryCode;
+
     /**
      * 所属网格名称
      */

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcParentIdFormDTO.java

@@ -0,0 +1,17 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/11/4 14:25
+ */
+@Data
+public class EpdcParentIdFormDTO implements Serializable {
+
+    private Long deptId;
+
+    private String[] typeKeys;
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/AppModuleListDTO.java

@@ -17,6 +17,10 @@ public class AppModuleListDTO implements Serializable {
 
     private String name;
 
+    private String typeCode;
+
     private String imgUrl;
 
+    private String moduleStyle;
+
 }

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java

@@ -49,6 +49,11 @@ public class ModuleTypeDTO implements Serializable {
      */
 	private String pids;
 
+    /**
+     * 栏目样式
+     */
+    private String moduleStyle;
+
     /**
      * 栏目类别
      */

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UsersGradeRankingDTO.java

@@ -39,4 +39,8 @@ public class UsersGradeRankingDTO implements Serializable {
      * 用户个人头像
      */
     private String faceImg;
+
+    private String pdtj;
+
+    private Integer pointsTotle;
 }