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/dto/InfoDto.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/dto/InfoDto.java b/src/main/java/com/whyc/dto/InfoDto.java
index feab3ae..d436502 100644
--- a/src/main/java/com/whyc/dto/InfoDto.java
+++ b/src/main/java/com/whyc/dto/InfoDto.java
@@ -63,6 +63,12 @@
@ApiModelProperty(value = "鐢垫簮绫诲瀷:1:鐩存祦锛�2锛氶�氳锛�3閰嶇綉")
private Integer powerType;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+ private Date powerInuseTime;
+
+ @ApiModelProperty(value = "鏁存祦鍣ㄤ娇鑳絒bit0-妯″潡1 bit15-妯″潡16]銆�1-鍙敤 0-涓嶅彲浠ャ��")
+ private Long modelCfg;
+
@ApiModelProperty(value = "璁惧id")
@@ -108,10 +114,10 @@
@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;
@ApiModelProperty(value = "鏍囪瘑鏄惁鍔犲叆鐢垫睜缁�1:娣诲姞锛�0涓嶆坊鍔�")
private Integer addBinfFlag;
--
Gitblit v1.9.1