From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java
index eba47aa..60b8964 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java
@@ -25,7 +25,7 @@
private String feeId;
- private Date createTime;
+ private String createTime;
public String getPrimeRate() {
@@ -92,11 +92,12 @@
this.feeId = feeId;
}
- public Date getCreateTime() {
+
+ public String getCreateTime() {
return createTime;
}
- public void setCreateTime(Date createTime) {
+ public void setCreateTime(String createTime) {
this.createTime = createTime;
}
}
--
Gitblit v1.8.0