Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-03-17 b76a3b11668f243463468af4c13dd3e82718f93b

 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;
}