From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java |  122 ++++++++++++++++++++--------------------
 1 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java
index 830a13e..c03dc79 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java
@@ -20,66 +20,66 @@
     private String orderType;
     @ApiModelProperty(value = "账单分类")
     private String type;
-    @ApiModelProperty(value = "账单周期")
-    private String accountType;
-    @ApiModelProperty(value = "站点名称")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-    @ApiModelProperty(value = "账户类型")
-    private String accountType;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    @ApiModelProperty(value = "订单总金额")
-    private BigDecimal orderAmount;
-    @ApiModelProperty(value = "累计电费")
-    private BigDecimal electrovalence;
-    @ApiModelProperty(value = "累计服务费")
-    private BigDecimal serviceCharge;
-    @ApiModelProperty(value = "订单数量")
-    private Integer orderCount;
-    @ApiModelProperty(value = "平台手续费")
-    private BigDecimal commissionAmount;
-    @ApiModelProperty(value = "三方平台分佣")
-    private BigDecimal sharingAmount;
-    @ApiModelProperty(value = "优惠抵扣")
-    private BigDecimal discount;
-    @ApiModelProperty(value = "账单分类 1全站 2各个站点 前端忽略")
-    private String category;
-    @ApiModelProperty(value = "账单类型 月结 前端忽略")
-    private String type;
-    @ApiModelProperty(value = "站点名称 前端忽略")
-    private String siteName;
-    @ApiModelProperty(value = "账单周期 前端忽略")
-    private String billWeek;
-    @ApiModelProperty(value = "账单生成日期 前端忽略")
-    private String createTime;
-    @ApiModelProperty(value = "账单编号 前端忽略")
-    private String code;
-    @ApiModelProperty(value = "充电时长 前端忽略")
-    private String chargingTime;
+//    @ApiModelProperty(value = "账单周期")
+//    private String accountType;
+//    @ApiModelProperty(value = "站点名称")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//    @ApiModelProperty(value = "订单总金额")
+//    private BigDecimal orderAmount;
+//    @ApiModelProperty(value = "累计电费")
+//    private BigDecimal electrovalence;
+//    @ApiModelProperty(value = "累计服务费")
+//    private BigDecimal serviceCharge;
+//    @ApiModelProperty(value = "订单数量")
+//    private Integer orderCount;
+//    @ApiModelProperty(value = "平台手续费")
+//    private BigDecimal commissionAmount;
+//    @ApiModelProperty(value = "三方平台分佣")
+//    private BigDecimal sharingAmount;
+//    @ApiModelProperty(value = "优惠抵扣")
+//    private BigDecimal discount;
+//    @ApiModelProperty(value = "账单分类 1全站 2各个站点 前端忽略")
+//    private String category;
+//    @ApiModelProperty(value = "账单类型 月结 前端忽略")
+//    private String type;
+//    @ApiModelProperty(value = "站点名称 前端忽略")
+//    private String siteName;
+//    @ApiModelProperty(value = "账单周期 前端忽略")
+//    private String billWeek;
+//    @ApiModelProperty(value = "账单生成日期 前端忽略")
+//    private String createTime;
+//    @ApiModelProperty(value = "账单编号 前端忽略")
+//    private String code;
+//    @ApiModelProperty(value = "充电时长 前端忽略")
+//    private String chargingTime;
 
 }

--
Gitblit v1.7.1