From 31901b3b7fef0dccdf0ba4d56e566be4103563b8 Mon Sep 17 00:00:00 2001 From: yxx <1392859652@qq.com> Date: Mon, 10 Oct 2022 11:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=A8=8E=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/pojo/organization/HrOrganizationDTO.java | 5 +++++ .../api/pojo/organization/HrOrganizationRequest.java | 7 +++++++ .../system/api/pojo/organization/OrganizationTreeNode.java | 6 ++++++ .../system/modular/organization/entity/HrOrganization.java | 7 +++++++ 4 files changed, 25 insertions(+) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java index 658a150cd..9ca26cc98 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java @@ -79,6 +79,11 @@ public class HrOrganizationDTO { */ private Integer orgType; + /** + * 税号 + */ + private String taxNo; + /** * 组织机构描述 */ diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java index e4c7ec76c..14d687a13 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java @@ -29,6 +29,7 @@ import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue; import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; @@ -109,6 +110,12 @@ public class HrOrganizationRequest extends BaseRequest { @ChineseDescription("组织机构类型:1-公司,2-部门") private Integer orgType; + /** + * 税号 + */ + @ChineseDescription("税号") + private String taxNo; + /** * 描述 */ diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java index 73c84a581..200a7ae51 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java @@ -101,6 +101,12 @@ public class OrganizationTreeNode implements AbstractTreeNode