Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-18 56abd8830c7c8166d995d7ad3ba014ad6a44c988

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

@@ -111,4 +111,8 @@
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "已充电百分比")
    @TableField(exist = false)
    private Integer soc;

}