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/PowerInf.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_station/PowerInf.java b/src/main/java/com/whyc/pojo/db_station/PowerInf.java
index 13a7652..b4c3749 100644
--- a/src/main/java/com/whyc/pojo/db_station/PowerInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/PowerInf.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -60,6 +62,12 @@
@ApiModelProperty(value = "鐢垫簮绫诲瀷:1:鐩存祦锛�2锛氶�氳锛�3閰嶇綉")
private Integer powerType;
+ @ApiModelProperty(value = "鏁存祦鍣ㄤ娇鑳絒bit0-妯″潡1 bit15-妯″潡16]銆�1-鍙敤 0-涓嶅彲浠ャ��")
+ private Long modelCfg;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+ private Date powerInuseTime;
+
@TableField(exist = false)
private StationInf sinf;
@@ -72,12 +80,14 @@
@TableField(exist = false)
private String city;
-
@TableField(exist = false)
private String country;
@TableField(exist = false)
private String fullName;
+ @TableField(exist = false)
+ private String stationType;
+
}
--
Gitblit v1.9.1