Merge remote-tracking branch 'origin/master'

xuhy

2024-09-25 ca825fdfe67223b2eb8a3f9c14b4e60e2339efc6

 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")