From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
index e13aeca..d821744 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
@@ -61,7 +61,6 @@
         Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
         Assert.hasKeyAndValue(reqJson, "machineId", "鏈寘鍚厖鐢垫々");
         Assert.hasKeyAndValue(reqJson, "portId", "鏈寘鍚彃妲�");
-        Assert.hasKeyAndValue(reqJson, "orderId", "鏈寘鍚鍗曞彿");
 
         String userId = context.getReqHeaders().get("user-id");
         Assert.hasLength(userId, "鐢ㄦ埛涓嶅瓨鍦�");
@@ -98,7 +97,6 @@
         chargeMachinePortDto.setPortId(reqJson.getString("portId"));
         List<ChargeMachinePortDto> chargeMachinePortDtos = chargeMachinePortV1InnerServiceSMOImpl.queryChargeMachinePorts(chargeMachinePortDto);
 
-        String orderId = reqJson.getString("orderId");
         //璋冪敤鍏呯數妗╁厖鐢�
         ResultVo resultVo = chargeCoreImpl.stopCharge(chargeMachineDtos.get(0), chargeMachinePortDtos.get(0));
 

--
Gitblit v1.8.0