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/Bikes.java | 2 +-
1 files changed, 1 insertions(+), 1 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 4dd61cf..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,7 +82,7 @@
@ApiModelProperty(value = "褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)")
@ExcelColumn(name="褰撳墠閿佸ご缂栫爜锛堝叧鑱攍ocks)")
- private String lockId;
+ private Integer lockId;
@ApiModelProperty(value = "鏈�杩戠鍊熸椂闂�")
@ExcelColumn(name="鏈�杩戠鍊熸椂闂�")
--
Gitblit v1.9.3