From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java b/src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java
index fa16ce3..0aaae98 100644
--- a/src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java
+++ b/src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java
@@ -25,6 +25,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* 实体类
@@ -62,7 +63,7 @@
*/
@ApiModelProperty(value = "出资时间")
@TableField("capitalTime")
- private String capitaltime;
+ private Date capitaltime;
/**
* 身份证
*/
--
Gitblit v1.9.3