From 6e78d2b1b00eceac3ee6222b713f749e21428f9a Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 30 十月 2023 09:09:07 +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/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..bb86ca0 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,11 +67,22 @@ @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(exist = false) private Sites sites; } -- Gitblit v1.9.3