From de9369d2c8056e2bb723247b0e877fe9d96f8def Mon Sep 17 00:00:00 2001 From: xusd <hugeinfo123> Date: Sun, 15 Sep 2024 15:20:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/domain/po/CtUnit.java | 65 +++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 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 cec1cd6..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,13 +7,14 @@ import lombok.Data; import java.util.Date; +import java.util.List; /** * @title: 客户组织信息表数据库对应关系类 * @description: PO中的属性与数据表是一一对应关系,如需根据业务处理不同,请使用BO对象。 * @company:hugeinfo * @author: liyj - * @time: 2024-08-17 15:30:57 + * @time: 2024-08-19 20:04:19 * @version 1.0.0 */ @TableName(value = "dyh_ct_unit") @@ -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