From 05d218bdda3f09aa5d057fda916f5f0b668fb720 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Aug 2021 17:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/revoke/entity/Revoke.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
index ae55c48..d645574 100644
--- a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
+++ b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -137,6 +137,7 @@
 	@ApiModelProperty(value = "撤销日期")
 	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private Date ctime;
+	private Date permitime;
 	private String deptid;
+	private String ptype;
 }

--
Gitblit v1.9.3