From 65f4876957d95740104b49af7ead3a2d0c2156b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 14:04:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index d13a64e..4dd61cf 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -87,10 +87,14 @@
@ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�")
@ExcelColumn(name="鏈�杩戠鍊熸椂闂�")
//@JsonFormat(pattern = "yyyy-MM-dd")
- private Date lastRentData;
+ private Date lastRentDate;
+ @ApiModelProperty(value = "鏈�杩戣繕杞︽椂闂�")
+ @ExcelColumn(name="鏈�杩戣繕杞︽椂闂�")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
+ private Date lastBackDate;
@ApiModelProperty(value = "鍑哄敭鏃堕棿")
- @ExcelColumn(name="鍑哄敭鏃堕棿")
+ @ExcelColumn(name="")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date soldoutDate;
--
Gitblit v1.9.3