From c97b518d5fbb570817ca835e96c1b8aa49b099e1 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 23 十月 2024 19:15:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java index 690a19c..80615b0 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.math.BigDecimal; +import java.util.List; @Data @ApiModel(value = "发票管理VO") @@ -16,7 +17,8 @@ @ApiModelProperty(value = "服务费税率") private BigDecimal serviceTariff; - + @ApiModelProperty(value = "uid") + private String uid; @ApiModelProperty(value = "增值服务费税率") private BigDecimal addedServiceTariff; @ApiModelProperty(value = "电费") @@ -27,5 +29,7 @@ private BigDecimal addedService; @ApiModelProperty(value = "用户电话") private String userPhone; + @ApiModelProperty(value = "充电订单ids") + private List<String> ids; } -- Gitblit v1.7.1