Merge remote-tracking branch 'origin/master'

xuhy

2024-08-16 3e1fc145ecefd1d823423b2e31366a0c1c9a723c

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

@@ -96,6 +96,4 @@
    @ApiModelProperty(value = "设备状态（1=工作中，2=离线，3=故障）")
    @TableField("status")
    private Integer status;


}