From d651a004647ed5ce63c79e56616d9ba961f10b00 Mon Sep 17 00:00:00 2001 From: xusd <hugeinfo123> Date: Mon, 14 Oct 2024 18:12:09 +0800 Subject: [PATCH] Merge branch 'release/release_20241014' into gzdyh_test --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java index 09a7f4e..895a3d5 100644 --- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java +++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java @@ -7,6 +7,7 @@ import lombok.Data; import java.util.Date; +import java.util.List; /** * @title: 客户组织信息表数据库对应关系类 @@ -207,7 +208,7 @@ private Integer dispStatus; /** - * 删除状态,0:已删除,1:未删除 + * 删除状态,0:未删除,1:已删除 */ @TableLogic @TableField(value = "delete_status") @@ -231,4 +232,64 @@ @TableField(value = "update_time") private Date updateTime; + /** + * 邮政编码 + */ + @TableField(value = "postal_code") + private String postalCode; + + /** + * 联系电话 + */ + @TableField(value = "telephone") + private String telephone; + + /** + * 办公时间,周 + */ + @TableField(value = "work_time_week") + private String workTimeWeek; + + /** + * 办公时间,上午 + */ + @TableField(value = "work_time_am") + private String workTimeAm; + + /** + * 办公时间,下午 + */ + @TableField(value = "work_time_pm") + private String workTimePm; + + /** + * 子部门 + */ + @TableField(exist = false) + private List<CtDept> ctDepts; + + /** + * 部门数量 + */ + @TableField(exist = false) + private Integer countCtDept; + + /** + * 人员数量 + */ + @TableField(exist = false) + private Integer countCtUser; + + /** + * 子组织 + */ + @TableField(exist = false) + private List<CtUnit> children; + + /** + * 组织下未配岗人员 + */ + @TableField(exist = false) + private List<CtUser> unMatchUsers; + } -- Gitblit v1.8.0