diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index a49e8f80..74484410 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -2436,7 +2436,7 @@ public class EnumsController extends BaseController { public AjaxResult getWaresType() { List enumEntityList = new ArrayList<>(); for (EWaresType value : EWaresType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ENU_WARES_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index a6c0bcc2..f35e9fec 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -569,11 +569,6 @@ public class EnumsPrefixConstants { * 验证类型枚举 */ public static final String ENU_VERIFY = "ENU_VERIFY_T_"; - - /** - * 商品类型枚举 - */ - public static final String ENU_WARES_TYPE = "ENU_WARES_TYPE_P_"; /** * 是否打印枚举 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresType.java index e4d2875f..a8dd7a7c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresType.java @@ -1,6 +1,5 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; @@ -14,7 +13,7 @@ public enum EWaresType { /** * 1=普通商品 */ - ORDINARY(1, "普通商品", EnumsPrefixConstants.ENU_WARES_TYPE + "1"), + ORDINARY(1, "普通商品"), ; @@ -27,17 +26,13 @@ public enum EWaresType { * 显示标签 */ private final String label; - /** - * 国际化翻译key值 - */ - private final String key; public static String getLabelByValue(Integer value) { if (null == value) { return ""; } for (EWaresType enums : EWaresType.values()) { - if (enums.getValue() == value) { + if (enums.getValue().equals(value)) { return enums.getLabel(); } }