Merge remote-tracking branch 'origin/master'

xuhy

2024-11-04 c0211a20f4f2d94fe1ac7657284504afa876b8a0

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java

@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "1未出账2已出账")
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "账单类型 1充电算帐单 2账号结算帐单")
    @TableField("billType")
    private Integer billType;
    @ApiModelProperty(value = "1日结2月结")
    @TableField("orderState")
    private Integer orderState;