From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..6eaa715 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
@@ -82,15 +82,19 @@
@ApiModelProperty(value = "褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)")
@ExcelColumn(name="褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)")
- private String lockId;
+ private Integer lockId;
@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