From 64a623c4f3b4438e6f5e790d2e77ff7a797e4ec6 Mon Sep 17 00:00:00 2001
From: chenjinlong <22208488@qq.com>
Date: Sun, 20 Dec 2020 19:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90system=E3=80=91org=E5=92=8Cposition?=
 =?UTF-8?q?=E7=9A=84remark=E5=8A=A0=E4=B8=8A=E4=B8=9A=E5=8A=A1=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/pojo/organization/HrOrganizationRequest.java       | 2 +-
 .../kernel/system/pojo/organization/HrPositionRequest.java    | 2 +-
 .../system/modular/organization/entity/HrOrganization.java    | 4 ++--
 .../kernel/system/modular/organization/entity/HrPosition.java | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java
index 8cfebc5dd..b2fe170a7 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java
@@ -73,6 +73,6 @@ public class HrOrganizationRequest extends BaseRequest {
     /**
      * 描述
      */
-    private String remark;
+    private String orgRemark;
 
 }
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 0db031a9a..69278e533 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 remark;
+    private String orgRemark;
 
 }
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 5df1f59b5..1ca55d6d9 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
@@ -65,8 +65,8 @@ public class HrOrganization extends BaseEntity {
     /**
      * 描述
      */
-    @TableField("remark")
-    private String remark;
+    @TableField("org_remark")
+    private String orgRemark;
 
     /**
      * 删除标记（Y-已删除，N-未删除）
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 d7bbccefd..03fcc78cf 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
@@ -53,8 +53,8 @@ public class HrPosition extends BaseEntity {
     /**
      * 备注
      */
-    @TableField("remark")
-    private String remark;
+    @TableField("org_remark")
+    private String orgRemark;
 
     /**
      * 删除标记：Y-已删除，N-未删除