Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 7daaf245531a944bf9ea737e8a1c2d6fda51c10c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java

@@ -34,7 +34,7 @@
   @ApiModelProperty("已充电度数")
   private BigDecimal chargedDegrees;
   @ApiModelProperty("已充电时间")
   private Integer chargedTime;
   private String chargedTime;
   @ApiModelProperty("充电费用")
   private BigDecimal chargingCost;
   @ApiModelProperty("充电状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")