From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Locks.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 7d56295..e5cf83f 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
@@ -67,9 +67,20 @@
@ExcelColumn(name="绔欑偣缂栫爜(鍏宠仈sites)")
private String siteId;
+ @ApiModelProperty(value = "绔欑偣缂栫爜(鍏宠仈sites)")
+ @ExcelColumn(name="绔欑偣缂栫爜(鍏宠仈sites)")
+ @TableField(select = false)
+ private String siteName;
+
@ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
@ExcelColumn(name="褰撳墠閿佸畾鑷杞︾紪鍙�")
private String bikeCode;
+
+ @ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
+ @ExcelColumn(name="褰撳墠閿佸畾鑷杞︾被鍨�")
+ @TableField(select = false)
+ private String bikeType;
+
@ApiModelProperty(value = "褰撳墠閿佸畾鑷杞︾紪鍙�")
@TableField(select = false)
private Sites sites;
--
Gitblit v1.9.3