Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-20 1ebf83b7b8ae636f00d49406e4c9bbff2d73c34d

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

@@ -50,7 +50,7 @@

    @ApiModelProperty(value = "充电车辆 id")
    @TableField("app_user_car_id")
    private Integer appUserCarId;
    private Long appUserCarId;

    @ApiModelProperty(value = "站点 id")
    @TableField("site_id")