From 1e676b408c8c7e1ccca08b151619d89fdc2bc9bf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 14:40:31 +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/MemberRides.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 418eb3b..dd62879 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -25,7 +25,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -34,14 +34,14 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@ExcelColumn(name="缂栬緫浜�")
private String editor;
- @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
@TableLogic
private Integer isdeleted;
@@ -64,7 +64,7 @@
@ExcelColumn(name="杞﹁締缂栫爜")
private String bikeCode;
- @ApiModelProperty(value = "褰撳墠璐︽埛浣欓", example = "1")
+ @ApiModelProperty(value = "褰撳墠璐︽埛浣欓")
@ExcelColumn(name="褰撳墠璐︽埛浣欓")
private BigDecimal balance;
@@ -87,7 +87,7 @@
@ApiModelProperty(value = "绉熻溅鏃堕棿")
@ExcelColumn(name="绉熻溅鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date rentDate;
@ApiModelProperty(value = "绉熻溅鎸囦护缂栫爜")
@@ -104,47 +104,47 @@
@ApiModelProperty(value = "杩樿溅鏃堕棿")
@ExcelColumn(name="杩樿溅鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date backDate;
@ApiModelProperty(value = "杩樿溅鎸囦护缂栫爜")
@ExcelColumn(name="杩樿溅鎸囦护缂栫爜")
private String backCommondId;
- @ApiModelProperty(value = "璧锋浠�", example = "1")
+ @ApiModelProperty(value = "璧锋浠�")
@ExcelColumn(name="璧锋浠�")
private BigDecimal basePrice;
- @ApiModelProperty(value = "璧锋浠锋椂闂�", example = "1")
+ @ApiModelProperty(value = "璧锋浠锋椂闂�")
@ExcelColumn(name="璧锋浠锋椂闂�")
private Integer baseTime;
- @ApiModelProperty(value = "瓒呭嚭鍗曚环", example = "1")
+ @ApiModelProperty(value = "瓒呭嚭鍗曚环")
@ExcelColumn(name="瓒呭嚭鍗曚环")
- private Integer unitPrice;
+ private BigDecimal unitPrice;
- @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅", example = "1")
+ @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅")
@ExcelColumn(name="瓒呭嚭鏃堕棿鍗曚綅")
private Integer unitTime;
- @ApiModelProperty(value = "楠戣浠锋牸", example = "1")
+ @ApiModelProperty(value = "楠戣浠锋牸")
@ExcelColumn(name="楠戣浠锋牸")
private BigDecimal price;
- @ApiModelProperty(value = "楠戣瀹為檯浠锋牸", example = "1")
+ @ApiModelProperty(value = "楠戣瀹為檯浠锋牸")
@ExcelColumn(name="楠戣瀹為檯浠锋牸")
private BigDecimal actualPrice;
- @ApiModelProperty(value = "楠戣璁¤垂鏃堕暱", example = "1")
+ @ApiModelProperty(value = "楠戣璁¤垂鏃堕暱")
@ExcelColumn(name="楠戣璁¤垂鏃堕暱")
private Integer duration;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
@ExcelColumn(name="缁撶畻鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date closeDate;
- @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�", example = "1")
+ @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
@ExcelColumn(name="缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
private Integer closeStatus;
@@ -152,7 +152,7 @@
@ExcelColumn(name="鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
private String ordreId;
- @ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�")
@ExcelColumn(name="鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�")
private Integer isStandard;
@@ -164,11 +164,11 @@
@ExcelColumn(name="鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
private String isHoliday;
- @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
@ExcelColumn(name="鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
private Integer status;
- @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅", example = "1")
+ @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
@ExcelColumn(name="杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
private Integer backType;
--
Gitblit v1.9.3