From 8b65a5c9e392f46eeea7cfda9647d59aee4ec81a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 二月 2025 11:40:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/services/src/main/java/com/doumee/dao/business/model/Bikes.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 0d8f16d..9a59e62 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
@@ -40,6 +40,9 @@
     @ExcelColumn(name="缂栬緫鏃堕棿")
     //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
+    @ApiModelProperty(value = "鏈�杩戜綆鐢甸噺鎶ヨ鏃堕棿")
+    //@JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lowVoltageAlarmTime;
 
     @ApiModelProperty(value = "缂栬緫浜�")
     @ExcelColumn(name="缂栬緫浜�")
@@ -123,5 +126,13 @@
     @ApiModelProperty(value = "鏈�杩戝畾浣嶅湴鍧�")
     @ExcelColumn(name="鏈�杩戝畾浣嶅湴鍧�")
     private String location;
+    @ApiModelProperty(value = "鏄惁浣庣數閲� 0鍚� 1鏄�")
+    @TableField(exist = false )
+    private Integer lowVoltage;
+    @ApiModelProperty(value = "寮哄埗杩樿溅缁撴灉澶囨敞")
+    @ExcelColumn(name="寮哄埗杩樿溅缁撴灉澶囨敞")
+    private String forceBackInfo;
 
+    @ApiModelProperty(value = "灏忕▼搴忕爜")
+    private String imgurl;
 }

--
Gitblit v1.9.3