From 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 07 一月 2025 19:02:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java index cd6ebc7..68c1847 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java @@ -17,6 +17,8 @@ @ApiModelProperty(value = "订单状态") private Integer status; + @ApiModelProperty(value = "充值支付方式(1=微信,2=支付宝)") + private Integer rechargePaymentType; @ApiModelProperty(value = "充值支付状态(1=待支付,2=已支付)") private Integer rechargePaymentStatus; @ApiModelProperty(value = "电站id") @@ -86,4 +88,8 @@ private Long id; @ApiModelProperty(value = "订单uid") private String uid; + @ApiModelProperty(value = "订单详情按钮权限 ") + private Boolean authInfo = true; + @ApiModelProperty(value = "充电曲线按钮权限 ") + private Boolean authCurve = true; } -- Gitblit v1.7.1