Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-11 f78d6645f4f03af39dff8a3663506a55fdf01c03

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

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