From 49f98d682437c5d91fa07a72bdc3cb45c0600f82 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 09:57:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
index debe154..ef41a69 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TScreenContent.java
@@ -30,15 +30,15 @@
@TableField("green_electricity_today")
@ApiModelProperty("今日绿电消纳值")
- private BigDecimal greenElectricityToday;
+ private BigDecimal greenElectricityToday=BigDecimal.ZERO;
@TableField("car_discharge")
@ApiModelProperty("累计汽车放电量")
- private BigDecimal carDischarge;
+ private BigDecimal carDischarge=BigDecimal.ZERO;
@TableField("green_electricity")
@ApiModelProperty("累计绿电消纳电量")
- private BigDecimal greenElectricity;
+ private BigDecimal greenElectricity=BigDecimal.ZERO;
@TableField("title")
@ApiModelProperty("标题")
@@ -83,15 +83,15 @@
@TableField("statistical_deadline")
@ApiModelProperty("截止统计日期")
@JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime statisticalDeadline;
+ private Date statisticalDeadline;
@TableField("create_time")
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
+ private Date createTime;
@TableField("update_time")
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
+ private Date updateTime;
}
\ No newline at end of file
--
Gitblit v1.7.1