From d3b9773726fda802bc4ef5971af3d76b90ed208e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 16:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
index 5c2eca0..4bba239 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
@@ -1,9 +1,11 @@
package com.ycl.platform.base;
import com.fasterxml.jackson.annotation.JsonFormat;
+import enumeration.ContractStatus;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鍩虹鍝嶅簲
@@ -17,9 +19,10 @@
private Integer id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date gmtCreate;
+ private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date gmtUpdate;
+ private Date updateTime;
+
}
--
Gitblit v1.8.0