From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/revoke/entity/Revoke.java |    2 +-
 1 files changed, 1 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 3c116a4..2a2fcd4 100644
--- a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
+++ b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -137,7 +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 representativecell;
 	private String contacts;

--
Gitblit v1.9.3