Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-15 15041c37e21f29bb37acd5efd4ec1b9bba657c65

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

@@ -22,6 +22,8 @@
    private Integer type;
    @ApiModelProperty("状态（1未出账 2已出账）")
    private Integer state;
    @ApiModelProperty("状态（1日结 2月结）")
    private Integer orderState;
    @ApiModelProperty("uid 前端忽略")
    private String uid;