From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/pojo/db_station/BattInf.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_station/BattInf.java b/src/main/java/com/whyc/pojo/db_station/BattInf.java
index d607baf..cd43901 100644
--- a/src/main/java/com/whyc/pojo/db_station/BattInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/BattInf.java
@@ -80,9 +80,11 @@
@ApiModelProperty(value = "鍨嬪彿")
private String battModel;
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date createTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+ private Date inuseTime;
@TableField(exist = false)
private String stationName;
@@ -94,5 +96,26 @@
@ApiModelProperty(value = "0:璁惧涓嬫柊寤虹數姹犵粍锛�1鏂板缓涓�涓澶囦竴涓數姹犵粍")
private Integer addBinfFlag;
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+
+ @TableField(exist = false)
+ private String country;
+
+ @TableField(exist = false)
+ private String fullName;
+
+ @TableField(exist = false)
+ private String stationType;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧涓嬬數姹犵粍涓暟")
+ private Integer battCount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍖呮満缁勫悕绉�")
+ private String baojiGroupName;
}
--
Gitblit v1.9.1