From 5e1cfd9032785dbe6438c830acad294d346f2734 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 07 十一月 2023 17:29:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 d41374d..7e08143 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
@@ -72,7 +72,7 @@
@ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
@ExcelColumn(name="绉熻溅閿佸叿",index = 5,width = 10,align = HorizontalAlignment.CENTER)
- private String rentLockId;
+ private Integer rentLockId;
@ApiModelProperty(value = "绉熻溅鏃堕棿")
@ExcelColumn(name="绉熻溅鏃堕棿",index = 6,width = 10,align = HorizontalAlignment.CENTER)
@@ -87,7 +87,7 @@
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
@ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
- private String backLockId;
+ private Integer backLockId;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
private Date backDate;
--
Gitblit v1.9.3