From 263cdaab1f3e02a5e5d9c86afd7aefaaa9734a38 Mon Sep 17 00:00:00 2001
From: lhb <495598773@qq.com>
Date: Wed, 16 Apr 2025 14:14:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=94=B1=E5=A4=9A=E8=A7=92=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8D=95=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evotech/hd/common/core/entity/cloud/BatteryStation.java | 6 ++++++
 .../hd/resource/service/impl/AuthUserServiceImpl.java       | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java
index edcfbc7..91a833e 100644
--- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java
+++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java
@@ -145,5 +145,11 @@ public class BatteryStation implements Serializable {
     @Schema(description = "换电费用标准", hidden = true)
     @TableField(exist = false)
     private List<BatteryStationHdFeeStandard> feeStandardList;
+
+    @Schema(description = "营业起时间")
+    private String runStartTime;
+
+    @Schema(description = "营业止时间")
+    private String runEndTime;
     
 }
diff --git a/resource-server/src/main/java/com/evotech/hd/resource/service/impl/AuthUserServiceImpl.java b/resource-server/src/main/java/com/evotech/hd/resource/service/impl/AuthUserServiceImpl.java
index 027697f..6c28c8c 100644
--- a/resource-server/src/main/java/com/evotech/hd/resource/service/impl/AuthUserServiceImpl.java
+++ b/resource-server/src/main/java/com/evotech/hd/resource/service/impl/AuthUserServiceImpl.java
@@ -108,6 +108,9 @@ public class AuthUserServiceImpl implements AuthUserService {
 	
 	@Override
 	public Result<Integer> addUserRole(AuthUserRole aur) {
+		authUserRoleDao.delete(new QueryWrapper<AuthUserRole>()
+				.eq("uid", aur.getUid()));//先删除该用户的所有角色
+
 		boolean exists = authUserRoleDao.exists(new QueryWrapper<AuthUserRole>()
 				.eq("uid", aur.getUid()).eq("rcode", aur.getRcode()));
 		if (exists) {