From d9b88d6eeb378c0291f465862fc76ab6a5f46c8a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 09:04:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index a942f97..59484da 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -518,7 +518,7 @@
 			if(status == 5 || status == 6){
 				gunMonitoring.setStatus(3);
 			}
-			if(status == 4){
+			if(status == 4 || status == 7){
 				Integer id = gunMonitoring.getId();
 				TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
 				if(null != chargingOrder){

--
Gitblit v1.7.1