From b546e615197545bd327e859664d4e7b5ef1b00e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 25 Nov 2024 18:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=8A=B6=E6=80=81=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/enums/UserStatusEnum.java | 6 +++--- .../salary/enums/salarysob/SalaryEmployeeStatusEnum.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java index cdf894769..b449d0745 100644 --- a/src/com/engine/salary/enums/UserStatusEnum.java +++ b/src/com/engine/salary/enums/UserStatusEnum.java @@ -16,10 +16,10 @@ import java.util.stream.Collectors; public enum UserStatusEnum implements BaseEnum { TRIAL(0, "试用", 1), - FORMAL(1, "正式", 1), + FORMAL(1, "转正", 1), TEMPORARY(2, "临时", 1), - DELAY(3, "试用延期", 1), - FIRE(4, "解雇", 1), + DELAY(3, "见习", 1), + FIRE(4, "解聘", 1), DEPARTURE(5, "离职", 1), RETIRED(6, "退休", 1), INVALID(7, "无效", 1); diff --git a/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java b/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java index 02d9cb735..05a711d28 100644 --- a/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java +++ b/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java @@ -21,13 +21,13 @@ public enum SalaryEmployeeStatusEnum implements BaseEnum { TRIAL(0, "试用", 100121), - FORMAL(1, "正式", 100122), + FORMAL(1, "转正", 100122), TEMPORARY(2, "临时", 100123), - DELAY(3, "试用延期", 100124), + DELAY(3, "见习", 100124), - FIRE(4, "解雇", 100125), + FIRE(4, "解聘", 100125), DEPARTURE(5, "离职", 100126),