Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-11 f78d6645f4f03af39dff8a3663506a55fdf01c03

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

@@ -56,8 +56,8 @@
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "1日结2月结")
    @TableField("timeType")
    private Integer timeType;
    @TableField("orderState")
    private Integer orderState;
    @ApiModelProperty(value = "账户类型 1微信商户 2支付宝商户")
    @TableField("payType")
    private Integer payType;