From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
src/main/java/com/ruoyi/common/enums/BaseEnum.java | 8 ++++----
1 files changed, 4 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..cf84dde 100644
--- a/src/main/java/com/ruoyi/common/enums/BaseEnum.java
+++ b/src/main/java/com/ruoyi/common/enums/BaseEnum.java
@@ -4,10 +4,10 @@
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 +17,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