Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-28 bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java

@@ -80,6 +80,14 @@
    @ApiModelProperty(value = "总费用")
    @TableField("order_amount")
    private BigDecimal orderAmount;
    
    @ApiModelProperty(value = "支付金额")
    @TableField("payment")
    private BigDecimal payment;
    
    @ApiModelProperty(value = "支付方式")
    @TableField("payType")
    private String payType;

    @ApiModelProperty(value = "状态（1=已进场，2=已出场，3=已缴费出场）")
    @TableField("status")