From caf05aa76a5f286ebf606a266b3c97ed831728f4 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 23 Apr 2025 21:06:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=AD=A3=E5=85=83=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/service/impl/hard/HardThirdSelfZyServiceImpl.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/hard/HardThirdSelfZyServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/hard/HardThirdSelfZyServiceImpl.java
index 51683b92e..8fef72b79 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/hard/HardThirdSelfZyServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/hard/HardThirdSelfZyServiceImpl.java
@@ -97,7 +97,6 @@ public class HardThirdSelfZyServiceImpl implements HardThirdSelfZyService {
                     .parentCarId(null)
                     .sysType(null)
                     .orderStatus(HardOrderStatusEnum.CREATE.getType())
-                    .merchantId(null)
                     .orderType(HardOrderTypeEnum.ZY.getType())
                     .payType(HardPayTypeEnum.WALLET_CARD.getType())
                     .orderSourceTypeId(null)