From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 924aebf..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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -26,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -57,6 +58,12 @@
@ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
private String paramId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷")
+ @TableField(exist = false)
+ private String paramName;
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ @TableField(exist = false)
+ private String siteName;
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
@@ -65,6 +72,9 @@
@ApiModelProperty(value = "鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ", example = "1")
@ExcelColumn(name="鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ")
private Integer status;
+ @ApiModelProperty(value = "鏄惁鏈夎溅 0鍏ㄩ儴 1鏃犺溅 2鏈夎溅 null涓哄叏閮�", example = "1")
+ @TableField(exist = false)
+ private Integer hasBike;
@ApiModelProperty(value = "褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)")
@ExcelColumn(name="褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)")
@@ -76,12 +86,16 @@
@ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�")
@ExcelColumn(name="鏈�杩戠鍊熸椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date lastRentData;
+ //@JsonFormat(pattern = "yyyy-MM-dd")
+ private Date lastRentDate;
+ @ApiModelProperty(value = "鏈�杩戣繕杞︽椂闂�")
+ @ExcelColumn(name="鏈�杩戣繕杞︽椂闂�")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
+ private Date lastBackDate;
@ApiModelProperty(value = "鍑哄敭鏃堕棿")
- @ExcelColumn(name="鍑哄敭鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date soldoutDate;
}
--
Gitblit v1.9.3