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/Locks.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
index e5cf83f..e69423b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Locks.java
@@ -57,7 +57,7 @@
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
- private String code;
+ private Integer code;
@ApiModelProperty(value = "鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父", example = "1")
@ExcelColumn(name="鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父")
@@ -82,7 +82,7 @@
private String bikeType;
@ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
- @TableField(select = false)
+ @TableField(exist = false)
private Sites sites;
}
--
Gitblit v1.9.3