From f55b38102c99878a0eb9a829ee9cf3bc8a76de01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:32 +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/BikeRepair.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
index 58d605b..2f246cb 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
@@ -18,7 +18,7 @@
*/
@Data
@ApiModel("杞﹁締闂涓婃姤淇℃伅琛�")
-@TableName("`bike_repair`")
+@TableName("\"bike_repair\"")
public class BikeRepair {
@ApiModelProperty(value = "缂栫爜")
@@ -27,7 +27,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -93,7 +93,7 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date dealDate;
@ApiModelProperty(value = "澶勭悊澶囨敞")
@@ -104,4 +104,8 @@
@ExcelColumn(name="鐜板満鎻忚堪")
private String content;
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+ @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+ private String memberId;
+
}
--
Gitblit v1.9.3