Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-26 17d64f6618e7eb748d6ffde703b97d1627f75043

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingGun.java

@@ -86,6 +86,10 @@
    @ApiModelProperty(value = "额定功率", required = true)
    @TableField("rated_power")
    private BigDecimal ratedPower;
    
    @ApiModelProperty(value = "实时充电功率", required = true)
    @TableField("charging_power")
    private BigDecimal chargingPower;

    @ApiModelProperty(value = "车位号")
    @TableField("parking_number")