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/EquipmentInfo.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 f19eddc..775bf7f 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
@@ -1,6 +1,7 @@
package com.ruoyi.integration.drainage.model;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -27,6 +28,13 @@
@Null
@JsonProperty("ManufacturerID")
private String manufacturerID;
+ /**
+ * 设备唯一
+ * 编码
+ */
+ @Null
+ @JsonProperty("EquipmentUniqueNumber")
+ private String equipmentUniqueNumber;
/**
* 设备生产商名称
*/
@@ -82,4 +90,10 @@
@Null
@JsonProperty("EquipmentName")
private String equipmentName;
+ /**
+ * 设备分类
+ */
+ @NotNull
+ @JsonProperty("EquipmentClassification")
+ private Integer equipmentClassification;
}
--
Gitblit v1.7.1