diff --git a/ad-platform-common/ad-platform-common-core/pom.xml b/ad-platform-common/ad-platform-common-core/pom.xml
index 3e3c6442..492e8ff4 100644
--- a/ad-platform-common/ad-platform-common-core/pom.xml
+++ b/ad-platform-common/ad-platform-common-core/pom.xml
@@ -101,6 +101,12 @@
org.springframework.security
spring-security-web
+
+
+
+ com.alibaba
+ easyexcel
+
diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ThreeUserDTO.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/ThreeUserDTO.java
new file mode 100644
index 00000000..6359d70f
--- /dev/null
+++ b/ad-platform-pojo/src/main/java/com/baiye/model/dto/ThreeUserDTO.java
@@ -0,0 +1,15 @@
+package com.baiye.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2022/1/21
+ */
+@Data
+public class ThreeUserDTO extends UserDto {
+
+ private List children;
+}
diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java
index 4982cfa2..f67b7092 100644
--- a/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java
+++ b/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java
@@ -39,8 +39,6 @@ public class UserDto extends BaseDTO implements Serializable {
private Set jobs;
- private DeptSmallDto dept;
-
private Long deptId;
private String username;
@@ -68,4 +66,6 @@ public class UserDto extends BaseDTO implements Serializable {
private Boolean isManager;
private Boolean isGroup;
+
+ private Boolean isRegistered;
}
diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserFavorOfExcel.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserFavorOfExcel.java
index 104f4e13..2ede9ade 100644
--- a/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserFavorOfExcel.java
+++ b/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserFavorOfExcel.java
@@ -12,27 +12,31 @@ public class UserFavorOfExcel {
/**
* 昵称
*/
+ //@ExcelProperty(index = 0)
private String nickName;
/**
* 邮箱
*/
+ //@ExcelProperty(index = 1)
private String email;
-
/**
* 号码
*/
+ //@ExcelProperty(index = 2)
private String phone;
/**
* 性别
*/
+ //@ExcelProperty(index = 3)
private String gender;
/**
* 密码
*/
+ //@ExcelProperty(index = 4)
private String password;
}
diff --git a/manage/ad-platform-management/pom.xml b/manage/ad-platform-management/pom.xml
index 5c0bbbed..acfe930e 100644
--- a/manage/ad-platform-management/pom.xml
+++ b/manage/ad-platform-management/pom.xml
@@ -101,12 +101,7 @@
swagger-spring-boot-starter
-
-
- com.alibaba
- easyexcel
- 2.2.7
-
+
+
+ com.alibaba
+ easyexcel
+ ${easyexcel.version}
+
diff --git a/services/ad-platform-source/pom.xml b/services/ad-platform-source/pom.xml
index e65bd0ed..aacf703a 100644
--- a/services/ad-platform-source/pom.xml
+++ b/services/ad-platform-source/pom.xml
@@ -38,19 +38,6 @@
1.0-SNAPSHOT
-
-
- com.alibaba
- easyexcel
- 2.2.7
-
-
-
-
- cn.hutool
- hutool-all
- 5.4.7
-