From da49ee682d0e59678a4feb1c233ae60db7bbba60 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Jul 2020 10:39:02 +0800
Subject: [PATCH] =?UTF-8?q?heart-work:act=5Fuser=5Flog=E5=88=A0=E9=99=A4*?=
 =?UTF-8?q?=20=E5=8F=91=E6=94=BE=E7=A7=AF=E5=88=86rewarded=20=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E5=8F=91=E6=94=BE=E7=A7=AF=E5=88=86refuse=5Freward=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=A4=84=E7=90=86processing=E8=BF=99?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8act=5Fpoint=5Flog=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/ActUserLogDTO.java          | 3 ---
 .../src/main/java/com/epmet/constant/ActConstant.java       | 6 ------
 .../src/main/java/com/epmet/entity/ActUserLogEntity.java    | 3 ---
 3 files changed, 12 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActUserLogDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActUserLogDTO.java
index aecb1b1750..fa3ec4ecd8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActUserLogDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActUserLogDTO.java
@@ -55,9 +55,6 @@ public class ActUserLogDTO implements Serializable {
      * 审核不通过refused
      * 取消报名canceld，
      * 已签到signedin
-     * 发放积分rewarded
-     * 拒绝发放积分refuse_reward
-     * 重新处理processing
      * ）
      */
 	private String operationType;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActConstant.java
index a13c2bed23..b15e4c5893 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActConstant.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActConstant.java
@@ -93,18 +93,12 @@ public interface ActConstant {
         审核不通过refused
         取消报名canceld，
         已签到signedin
-                发放积分rewarded
-        拒绝发放积分refuse_reward
-                重新处理processing
     ）*/
     String ACT_USER_LOG_OPER_AUDITING="auditing";
     String ACT_USER_LOG_OPER_PASSED="passed";
     String ACT_USER_LOG_OPER_REFUSED="refused";
     String ACT_USER_LOG_OPER_CANCELD="canceld";
     String ACT_USER_LOG_OPER_SIGNEDIN="signedin";
-    String ACT_USER_LOG_OPER_REWARDED="rewarded";
-    String ACT_USER_LOG_OPER_REFUSE_REWARD="refuse_reward";
-    String ACT_USER_LOG_OPER_PROCESSING="processing";
 
     /**
      * 审核通过类型：auto, manual
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserLogEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserLogEntity.java
index ac05ba61d1..49716d0dac 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserLogEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActUserLogEntity.java
@@ -51,9 +51,6 @@ public class ActUserLogEntity extends BaseEpmetEntity {
 	 * 审核不通过refused
 	 * 取消报名canceld，
 	 * 已签到signedin
-	 * 发放积分rewarded
-	 * 拒绝发放积分refuse_reward
-	 * 重新处理processing
 	 * ）
      */
 	private String operationType;