Merge remote-tracking branch 'origin/master'

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-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;
 }