diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java index d066017a..9cbbeae9 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java @@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.department.entity.DepartmentEntity; +import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; import lombok.Data; @@ -64,4 +65,7 @@ public class CreateEmployeeDto extends OrgCommonDto { @Comment("收款人姓名") private String bankCardName; + + @Comment("家庭成员") + private List familyMembers; } diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java index 70669e4b..8bf7d6f7 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java @@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.department.entity.DepartmentEntity; +import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; import cn.lihongjie.coal.file.entity.FileEntity; import jakarta.persistence.ManyToOne; @@ -104,4 +105,7 @@ public class EmployeeDto extends OrgCommonDto { + " and d.code = 'emp.status'\n" + " and i.code = emp_status)") private String empStatusName; + + @Comment("家庭成员") + private List familyMembers; } diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java index 7529a86d..27f3b9d4 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java @@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.department.entity.DepartmentEntity; +import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; import lombok.Data; @@ -64,4 +65,7 @@ public class UpdateEmployeeDto extends OrgCommonDto { @Comment("收款人姓名") private String bankCardName; + + @Comment("家庭成员") + private List familyMembers; } diff --git a/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java b/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java index 4fe89d5b..8275c8df 100644 --- a/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java +++ b/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java @@ -373,6 +373,7 @@ public class NetDiskService extends BaseService