From 9b583c3ae9f78328368b2eda8899f80204ed796f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 11:33:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/revoke/entity/Revoke.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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..6fc2780 100644
--- a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
+++ b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -63,7 +63,6 @@
 	 * 成立日期
 	 */
 	@ApiModelProperty(value = "成立日期")
-	@TableField("establishTime")
 	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date establishtime;
@@ -137,6 +136,15 @@
 	@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;
+	private String cardid;
+	private String representativecell;
+	private String contacts;
+	private String contactscell;
+	private String storage;
+	private String approve;
+	private String jurisdiction;
+
 }

--
Gitblit v1.9.3