From b76a3b11668f243463468af4c13dd3e82718f93b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 10:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/enu/EquipmentTypeEnum.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/enu/EquipmentTypeEnum.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/enu/EquipmentTypeEnum.java
index c5630c6..2ce02cc 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/enu/EquipmentTypeEnum.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/enu/EquipmentTypeEnum.java
@@ -10,7 +10,9 @@
 	ALTERNATING_CURRENT(2, "交流设备"),
 	ALTERNATING_DIRECT(3, "交直流一体设备"),
 	WIRELESS_DEVICE(4, "无线设备"),
-	OTHER(5, "其他")
+	OTHER(5, "其他"),
+	ORDER(6, "有序"),
+	V2G(7, "V2G")
 	;
 	
 	

--
Gitblit v1.7.1