From 140df6118633770e375942ebd770bfcdc5255b83 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 17 Nov 2020 13:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9apply=5Fstatus:under=5Fauditi?=
 =?UTF-8?q?ng:=E5=BE=85=E5=AE=A1=E6=A0=B8=EF=BC=9Bapproved:=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=EF=BC=9Brejected:=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IssueApplicationDTO.java | 5 +++--
 .../java/com/epmet/dto/IssueApplicationHistoryDTO.java   | 9 +++++----
 .../java/com/epmet/entity/IssueApplicationEntity.java    | 5 +----
 .../com/epmet/entity/IssueApplicationHistoryEntity.java  | 9 +++------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java
index e724934e49..cb5521e682 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -54,7 +55,7 @@ public class IssueApplicationDTO implements Serializable {
 	private String suggestion;
 
     /**
-     * 审核状态。under_auditting:审核中,approved:通过，rejected:驳回
+     * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回
      */
 	private String applyStatus;
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java
index d0a40e604d..09126d923a 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -49,9 +50,9 @@ public class IssueApplicationHistoryDTO implements Serializable {
 	private String issueApplicationId;
 
     /**
-     * under_auditting:提交审核；
-approved:审核通过，
-rejected:驳回
+     * under_auditing:待审核；
+     * approved:审核通过；
+     * rejected:驳回；
      */
 	private String actionType;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java
index 5134144ab3..d117c370e9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题转议题申请表
  *
@@ -54,7 +51,7 @@ public class IssueApplicationEntity extends BaseEpmetEntity {
 	private String suggestion;
 
     /**
-     * 审核状态。under_auditting:审核中,approved:通过，rejected:驳回
+	 * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回
      */
 	private String applyStatus;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java
index 9d621f2e8d..983dd8e550 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationHistoryEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题转议题审核历史表
  *
@@ -49,9 +46,9 @@ public class IssueApplicationHistoryEntity extends BaseEpmetEntity {
 	private String issueApplicationId;
 
     /**
-     * under_auditting:提交审核；
-approved:审核通过，
-rejected:驳回
+     * under_auditing:待审核；
+	 * approved:审核通过；
+	 * rejected:驳回；
      */
 	private String actionType;