Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-01 2d47f5ac48f6ee7eb0194ffb5b65ed12b3b64437

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

@@ -32,7 +32,7 @@
   @ApiModelProperty("订单时间")
   private String createTime;
   @ApiModelProperty("评价状态（1=待评价，2=已评价）")
   private Integer evaluate;
   private Long evaluate;
   @ApiModelProperty("电费")
   private BigDecimal electricCharge;
   @ApiModelProperty("服务费")