From 0174e78f6fb199d7988757ff645c2bd8d4dc869b Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 19 Nov 2020 12:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lz/common/emun/WorkMsgTypeEnum.java    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
index 047afd37..05349a24 100644
--- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
+++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
@@ -16,18 +16,13 @@ public enum WorkMsgTypeEnum {
     PASS(3, "绩效通过", "去查看", "# 绩效通过\n  ## 你的绩效已经通过"),
     URGING(4, "绩效催办", "去审批", "# 绩效催办\n  ## @提醒您审批"),
     END(5, "绩效终止", "去查看", "# 绩效终止\n  ## @，你的绩效终止"),
-<<<<<<< HEAD
     START_WORK(6, "绩效考评待办事项", "去查看", "# 绩效目标制定\n  ## @，你的绩效需要制定目标"),
     START_SCORE(7, "绩效考评待办事项", "去查看", "# 绩效结果输入\n  ## @，你的绩效需要输入结果"),
     PROCESS(8, "绩效考评待办事项", "去查看", "# @的绩效\n  ## 需您去处理"),
-    SKIP(9, "绩效跳过", "跳过", "# @的绩效\n  ## 己经跳过"),
-    TRANSFER(10, "绩效转交", "转交", "# @的绩效\n  ## 己经转交"),
-=======
-    START_WORK(6, "绩效考评待办事项", "制定目标", "\n 绩效目标制定\n  \n @，你的绩效需要制定目标"),
-    START_SCORE(7, "绩效考评待办事项", "输入结果", "\n 绩效结果输入\n  \n @，你的绩效需要输入结果"),
-    PROCESS(8, "绩效考评待办事项", "目标确认", "\n @的绩效\n  \n 需您去目标确认"),
-    SCORE(8, "绩效考评待办事项", "评分", "\n @的绩效\n  \n 需您去评分"),
->>>>>>> b16c903f3a09f8170eeedcd239fde8acc99f1d2c
+
+    SCORE(9, "绩效考评待办事项", "评分", "\n @的绩效\n  \n 需您去评分"),
+    SKIP(10, "绩效跳过", "跳过", "# @的绩效\n  ## 己经跳过"),
+    TRANSFER(11, "绩效转交", "转交", "# @的绩效\n  ## 己经转交"),
     // 您的2020年10月绩效考核已经开始，请尽快制定绩效目标
     // 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认
     ;