Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-23 59c5450e074572a607908986f8dc2e6dbd1151d5

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.order.api.model.TChargingOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -34,4 +35,6 @@
    private BigDecimal orderAmount;
    @ApiModelProperty(value = "车牌")
    private String carNum;
    private TChargingOrder tChargingOrder;
    private Long periodCount;
}