From b8f9b07913de4c088d86565c3b331b9263a9027c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
index e7663b5..fc27940 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
@@ -1,8 +1,6 @@
package com.ruoyi.order.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -81,8 +79,4 @@
private BigDecimal sharingAmount;
@ApiModelProperty(value = "费用明细-手续费")
private BigDecimal commissionAmount;
- @ApiModelProperty(value = "充电信息")
- List<UploadRealTimeMonitoringData> list;
- @ApiModelProperty(value = "费用明细-费用列表")
- List<TChargingOrderAccountingStrategy> list1;
}
--
Gitblit v1.7.1