From 425e84fac39a13928b603aeda6a2ae1892064461 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 8 Aug 2025 15:28:35 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8C=E6=AD=A5=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=AD=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzs/system/enums/controller/EnumsController.java | 2 +-
 .../hzs/common/core/constant/EnumsPrefixConstants.java   | 5 -----
 .../main/java/com/hzs/common/core/enums/EWaresType.java  | 9 ++-------
 3 files changed, 3 insertions(+), 13 deletions(-)

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<EnumEntity> 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();
             }
         }