Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-29 befe4a62e799c89c73c0b774c000c300bcc2ca18

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java

@@ -42,5 +42,5 @@
    @ApiModelProperty(value = "上次选择车辆品牌")
    private String vehicleBrand;
    @ApiModelProperty(value = "上次选择车辆id")
    private Long id;
    private String id;
}