From a0070809b2344266608de9f8c9ac5c8ce1c31a8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 七月 2025 20:59:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/PhotovoltaicAndConsumptionVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/PhotovoltaicAndConsumptionVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/PhotovoltaicAndConsumptionVO.java
index cb2148a..9ec03b0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/PhotovoltaicAndConsumptionVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/PhotovoltaicAndConsumptionVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.other.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +14,9 @@
@ApiModelProperty("装机容量")
private BigDecimal capacity = new BigDecimal("759.52");
@ApiModelProperty("今日已发电")
- private BigDecimal todayGenerateElectricity=new BigDecimal("71.29");
+ private BigDecimal todayGenerateElectricity=new BigDecimal("0");
+
+ @ApiModelProperty("今日绿电消纳值")
+ private BigDecimal greenElectricityToday=new BigDecimal("0.00");
}
--
Gitblit v1.7.1