From a45391d798a2f855ee395714d04e3559b3da5434 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 8 Aug 2025 14:48:23 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=82=A8=E7=BC=96=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/report/member/MemberReportMapper.xml  | 2 +-
 .../src/main/java/com/hzs/common/core/enums/EWaresType.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml
index 26a1eefd..b97c9dd6 100644
--- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml
+++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml
@@ -429,7 +429,7 @@
     <select id="listProductShippingDetail" resultType="com.hzs.report.member.vo.ProductShippingDetailsVO">
         select #{param.wmsCode} wmsCode,
         soi.pk_product,
-        so.order_type,
+        so.order_type specialArea,
         soi.is_maker_gift,
         sum(soi.quantity) quantity
         from sa_order so
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 ff1608cd..a64afee0 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
@@ -38,7 +38,7 @@ public enum EWaresType {
     private final String label;
 
     public static String getLabelByValue(Integer value) {
-        if (null != value) {
+        if (null == value) {
             return "";
         }
         for (EWaresType enums : EWaresType.values()) {