From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java
index 149cd59..d19924e 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/ChargingMessage.java
@@ -1,12 +1,18 @@
 package com.ruoyi.integration.rocket.model;
 
+import com.ruoyi.integration.drainage.model.ConnectorStatusInfo;
+import com.ruoyi.integration.drainage.model.SupChargeOrderInfo;
+import com.ruoyi.integration.drainage.model.SupEquipChargeStatus;
 import com.ruoyi.integration.rocket.base.BaseMessage;
 import lombok.Data;
 import org.apache.poi.ss.formula.functions.T;
 
 @Data
 public class ChargingMessage extends BaseMessage {
-
+    // 充电设备状态message
+    private GunStatusMessage gunStatusMessage;
+    // 推送充电订单状态/充电订单信息message
+    private ChargingOrderMessage orderMessage;
     private AcquisitionBillingModeMessage acquisitionBillingModeMessage;
     private BillingModeVerifyMessage billingModeVerifyMessage;
     private BmsAbortMessage bmsAbortMessage;

--
Gitblit v1.7.1