From d8786c8c3b5084bdad9ef318d056d81579e622f0 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 30 九月 2024 11:11:04 +0800 Subject: [PATCH] 合并 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEquimentVO.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEquimentVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEquimentVO.java index 29c7b90..c28ba50 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEquimentVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEquimentVO.java @@ -20,6 +20,12 @@ List<Map<String,Object>> equipmentMapOut1; @ApiModelProperty("交流离网率") List<Map<String,Object>> equipmentMapOut2; - @ApiModelProperty("需求电流满足率") - List<Map<String,Object>> needElec; + @ApiModelProperty("需求电流满足率直流") + List<Map<String,Object>> needElec1; + @ApiModelProperty("需求电流满足率交流") + List<Map<String,Object>> needElec2; + double average1; + double average2; + double average3; + double average4; } -- Gitblit v1.7.1