From 983c909aadeabc742e8f1286bf8c65cc3867950d Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 24 Dec 2020 13:23:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90org=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/system/pojo/organization/HrPositionRequest.java | 2 +- .../system/modular/organization/entity/HrOrganization.java | 2 +- .../system/modular/organization/entity/HrPosition.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java index 69278e533..0c3fc68d9 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java @@ -61,6 +61,6 @@ public class HrPositionRequest extends BaseRequest { /** * 备注 */ - private String orgRemark; + private String positionRemark; } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java index 1ca55d6d9..053b899bc 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java @@ -63,7 +63,7 @@ public class HrOrganization extends BaseEntity { private Integer statusFlag; /** - * 描述 + * 组织机构描述 */ @TableField("org_remark") private String orgRemark; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java index 03fcc78cf..84b850430 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java @@ -51,10 +51,10 @@ public class HrPosition extends BaseEntity { private Integer statusFlag; /** - * 备注 + * 职位备注 */ - @TableField("org_remark") - private String orgRemark; + @TableField("position_remark") + private String positionRemark; /** * 删除标记：Y-已删除，N-未删除