From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001 From: zengh <123456> Date: Thu, 19 Aug 2021 15:03:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/record/entity/Record.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java index 3bfb8e4..d0e3efe 100644 --- a/src/main/java/org/springblade/modules/record/entity/Record.java +++ b/src/main/java/org/springblade/modules/record/entity/Record.java @@ -154,12 +154,13 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date permitime; - private String reason; + private String approve; private String examinetime; private String cardid; private String representativecell; private String contacts; private String contactscell; + private String storage; } -- Gitblit v1.9.3