Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-06-24 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

@@ -56,6 +56,8 @@
   private List<Map<String, Object>> power;
   @ApiModelProperty("是否可申诉（0=否，1=是）")
   private Integer actionable;
   @ApiModelProperty("H5是否可申诉（0=否，1=是）")
   private Integer isAppeal;
   @ApiModelProperty("充电枪id")
   private Integer chargingGunId;
}