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 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 addUserRole(AuthUserRole aur) { + authUserRoleDao.delete(new QueryWrapper() + .eq("uid", aur.getUid()));//先删除该用户的所有角色 + boolean exists = authUserRoleDao.exists(new QueryWrapper() .eq("uid", aur.getUid()).eq("rcode", aur.getRcode())); if (exists) {