From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车

---
 server/services/src/main/java/com/doumee/dao/business/model/Locks.java |   19 +++++++++++++++++--
 1 files changed, 17 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 c760d3e..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
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,16 +59,30 @@
     @ExcelColumn(name="缂栧彿")
     private String code;
 
-    @ApiModelProperty(value = "鐘舵�� 0姝e父 1寮傚父", example = "1")
-    @ExcelColumn(name="鐘舵�� 0姝e父 1寮傚父")
+    @ApiModelProperty(value = "鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父", example = "1")
+    @ExcelColumn(name="鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父")
     private Integer status;
 
     @ApiModelProperty(value = "绔欑偣缂栫爜(鍏宠仈sites)")
     @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