From 9ce27f53094be15ee2e69c0dce31e3f324bfda99 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
index 5c64c3b..0ee3abe 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
@@ -18,56 +18,56 @@
 	 * 设备编号
 	 */
 	@NotNull
-	private String EquipmentID;
+	private String equipmentID;
 	/**
 	 * 设备生产商组织机构代码
 	 */
 	@Null
-	private String ManufacturerID;
+	private String manufacturerID;
 	/**
 	 * 设备生产商名称
 	 */
 	@Null
-	private String ManufacturerName;
+	private String manufacturerName;
 	/**
 	 * 设备型号
 	 */
 	@Null
-	private String EquipmentModel;
+	private String equipmentModel;
 	/**
 	 * 设备生产日期
 	 * YYYY-MM-DD
 	 */
 	@Null
-	private String ProductionDate;
+	private String productionDate;
 	/**
 	 * 设备类型
 	 */
 	@NotNull
-	private Integer EquipmentType;
+	private Integer equipmentType;
 	/**
 	 * 充电设备接口信息列表
 	 */
 	@NotNull
-	private List<ConnectorInfo> ConnectorInfos;
+	private List<ConnectorInfo> connectorInfos;
 	/**
 	 * 充电设备经度
 	 */
 	@Null
-	private BigDecimal EquipmentLng;
+	private BigDecimal equipmentLng;
 	/**
 	 * 充电设备纬度
 	 */
 	@Null
-	private BigDecimal EquipmentLat;
+	private BigDecimal equipmentLat;
 	/**
 	 * 充电设备总功率
 	 */
 	@NotNull
-	private BigDecimal Power;
+	private BigDecimal power;
 	/**
 	 * 充电设备名称
 	 */
 	@Null
-	private String EquipmentName;
+	private String equipmentName;
 }

--
Gitblit v1.7.1