From a60ba9317c84329c4cd43e0d13c55ec5fbddf253 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 11:23:37 +0800
Subject: [PATCH] fix(attendance): 添加班次重复校验防止配置冲突
---
src/main/java/com/ruoyi/common/enums/BaseEnum.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/enums/BaseEnum.java b/src/main/java/com/ruoyi/common/enums/BaseEnum.java
index cb6311c..7f5b538 100644
--- a/src/main/java/com/ruoyi/common/enums/BaseEnum.java
+++ b/src/main/java/com/ruoyi/common/enums/BaseEnum.java
@@ -1,13 +1,14 @@
package com.ruoyi.common.enums;
+import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
-public interface BaseEnum {
+public interface BaseEnum<T> {
@JsonValue
- Integer getCode();
-
+ T getCode();
+
String getValue();
/**
@@ -17,7 +18,7 @@
* 閫氱敤闈欐�佸伐鍏锋柟娉曪細鏀寔浠� Integer 鎴� String 绫诲瀷鐨� Code 杩涜鍙嶅簭鍒楀寲
*/
@JsonCreator(mode = JsonCreator.Mode.DELEGATING)
- static <E extends Enum<E> & BaseEnum> E fromCode(Class<E> enumClass, Object code) {
+ static <E extends Enum<E> & BaseEnum<?>> E fromCode(Class<E> enumClass, Object code) {
if (code == null) {
return null;
}
--
Gitblit v1.9.3