From e27c8b1e89a440a4535bf94302d52593e5f6fcf7 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 15 十月 2024 09:41:19 +0800 Subject: [PATCH] 10.15 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 16 ++++++++++++++++ ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java index f46fc43..1ab909b 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java @@ -58,7 +58,7 @@ @TableField("vip_id") private Integer vipId; - @ApiModelProperty(value = "1月卡2季卡3年卡") + @ApiModelProperty(value = "1月卡2季卡3年卡4集团") @TableField("vip_type") private Integer vipType; diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java index 382ce1d..0202131 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java @@ -158,6 +158,10 @@ @ApiModelProperty(value = "退款流水号") @TableField("refund_code") private String refundCode; + + @ApiModelProperty(value = "标题") + @TableField("title") + private String title; @ApiModelProperty(value = "退款原因") @TableField(exist = false) private String refundReason; @@ -173,6 +177,18 @@ @ApiModelProperty(value = "累计电费") @TableField("electrovalence") private BigDecimal electrovalence; + @ApiModelProperty(value = "电流") + @TableField("current") + private BigDecimal current; + @ApiModelProperty(value = "电压") + @TableField("voltage") + private BigDecimal voltage; + @ApiModelProperty(value = "电量") + @TableField("electricity") + private BigDecimal electricity; + @ApiModelProperty(value = "功率") + @TableField("power") + private BigDecimal power; @ApiModelProperty(value = "退款状态(1=退款中,2=退款成功)") @TableField("refund_status") -- Gitblit v1.7.1