修改冲突

puzhibing

2024-08-17 ffae18d7a8e21b93bc837d889504d2c8b55368c0

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

@@ -10,7 +10,7 @@
public class ChargingGunCountVO extends Site {

    @ApiModelProperty(value = "充电枪在线数量")
    private Integer onlineCount;
    private Integer freeCount;
    @ApiModelProperty(value = "充电枪总数数量")
    private Integer totalCount;