Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-08 66794a3e6b3feb01d4b6ae5710a0725b525a99dd

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetPermissionConfigurationDTO.java

@@ -17,5 +17,5 @@
   @ApiModelProperty(value = "备注")
   private String permissionRemarks;
   @ApiModelProperty(value = "权限菜单")
   private Map<String, Object> menu;
   private List<Map<String, Object>> menu;
}